[Preferences] More logical placement of some preferences