Few fixes
merged navigation.js