Minor cleanup and attempted to stop extra Navs