mockup sign up
Merge branch 'refactor'