Update user.rb
merge
fix ui issues