Work on new settings, more window work