Added more menus, added an idea for a query