Minor updates on menu and UsersController