added devise, fixed forms and views