adjusted definition of current_user in application controller and layout to not have @user