Added Register/Team views.
General tidy-up / refactoring.