cleaned up menus and layout