Cleaning up UI
Retooling to use Devise edit screen