Zoom levels and resolution
Merge branch 'focusmarker'