Fixed issue #1633: Pull windows layout problem