Cleaner navigation.js