nvaigation bar
changes in navigation.
Merge and cleanup