navigation fixes
merged changes