Window and Controller edits