changes to the navigation
merge master and fix conflicts