Merged with latest commit
Finished registration view