Preserve aspect ratio when zooming
Clean up