Made window display updating common