Tweak nav order & fix current highlight