Navigation clean-up; attempting baseline.js integration.