adding fixes to navigation