Made changes to forms and models