Fixing up nav more