Refactor edit.html.erb and new.html.erb for users