Fixes/window functionality