Updated with logged in menus, again.