Adding final polishing to user signup flow.
Merge conflict resolve