Zoom and zoom + context works with the two buttons
Merge branch 'feature-ZoomButton' into develop