sizing issues with window fixed
merge