Added main window and editor control