Windows are drawn in better positions now