More multi-window tweaks