Fix zoom scale problems and bugs with fixed toolbars
Merge pull request #182 from auxepaul/UP-3868

UP-3868: Fix zoom scale problems and bugs with fixed toolbars