some improvements in Settings interface;