Day 21b: Navigation fixes

Small changes to fix the navigation. Menu wasn't being loaded correctly.