Cleaned up navigation.js. Minor data fixes to data.js.