Fix reference to current_user
Clean up user nav messaging