Fixed some of the flow and UI issues.