Polish and re-model registration form