Added Tabs
Added Zoom buttons
Minor cleanup