Some small template and login changes after discussion with Hamish.
Merge branch 'theming-updates' into develop

* theming-updates:
  Some small template and login changes after discussion with Hamish.