[t:0hours:25minutes] Minor fixes for nav breaking