Tweaks for smaller windows