Finish functionality and design of user registration
Resolve confl