Settings dialog rework