Layout tweaks for Windows 7