Rework control toggles for use other than navigation