Updated layouts, added more menus