navigation fixes

.