Fixed a few UI issues and tweaked userflow.