Fixed UX inconsistencies, some code cleanup

Also fix the sign up bug. See code for more.
Merge branch 'master' of https://github.com/Anurag-Ans/JHTS