Minor changes
Fix zooming