Updated Tabs and Fixed Main