Added nav items

I'm combining these two branches!