Added menus and simplified tabs