Adding Devise and some changes