navigation changes
merged master