Final fix for windows layout issue, I think???