Add Devise, update forms