Add more from signup
Merge branch 'sign-up'