OSD settings re-work