Undoes a few things & changes upgrade text

This rolls back to commit b684ac7edfa608911c515b8a787dff8b3648f553.
removes the balls up I made of the signup / login form.