Global Nav fixes to allow for data download