merged back progress bar and Navigation bar code. Nav bar can now be enabled on new releases by hand.