Updated Design and Tabs