Fixing a few nav items
Everything working