Add in navigation and improved upload method