Finish user signup
 Made some change for template