Add 'users' views and improve navigation