Quite a bit of window and settings management improvements