added devise and modified user model