Add nav, and a few other fixes.