Update views and forms
Update Gemfile