block fixes and refactored @user to current_user