Moved Window drawing code to MonitorWindow