Added upload page and added pages and clean up