settings window tweaks and minor fixes