Window update

Update to have a glance at the new Window system in function