Added submit page and improved UI