Changed the flow of the application, all on one page now.