Improve layout logic to work on Windows