Fix new window sizing following the layout changes