Added menus! Re-organized!