Re-factor nav highlighting