Restructure and clean up
Clean up login form (a little)