saving some space in settings dialog - cleanup part I
saving some space in settings dialog - cleanup part II