fixes signup error and changes design
Merge branch 'work'

shouldnt be a conflict