Fixed window/view/level_editor hierarchy
resolved conflicts