updated menus, cleaned up pages