Moved zoom control, cleaned some code up