Visual tree + window refactoring.