Merge pull request #1201 from etimberg/feature/v2.0-scale-refactor

Move stacked options into scales. Can be configured independently for each axis