More fixes to key remap dialog