User signup flow cleanup
Prettying things up a bit