Added menus (not fully working)