basics of zooming and panning around
fix
Merging + more room cleanup