Minor tweaks to navbar menu order.