DF-5469 Reorganized settings, added singe-line vertical highlight