General clean up. Bug fixes around registration and showing messages.
Some styling changes