Window and view refactoring