Added Devise and re-factored HTML