Add basic zoom
Add panning
Tidy up button grouping