Bugfixes and Lock Zoom

See Commits.
Fixes #594 #595 and adds lock zoom checkbox.