Modified user account navigation again