Refactor signup alert
Merge branch 'sign-up'