Add 'else' conditional to with_current_user, update some templates