Window improvements

Minor changes to reflect the improvements in 5-second-rule/rendering-framework#27