Merge pull request #125 from loqi/ui

Syncs ui branch
Hybrid signup/login