Completed 1st draft of register page
Merged with origin-master