Move Navigation Manipulator toggle next to Mini Axis as they are related (and in the future merged into one pulldown) and rename Manipulator to "Transform Manipulator" to make it clear they're different kinds of manipulators. Also move to the first column next to other viewport settings.