Registration page feature refactored

@daviddemello @carolineHecht. Please take a look when you have a chance. I tested the functionality after refactoring, but since you're more familiar with it, Caroline, it would be great if you could take a closer look and confirm. Thanks!
Well that's cumbersome!