Finish user signup part one
Update layout