UX sign up
done
fixed merge conflict