Fix Win7 layout bug