Refactored Window & Modified Hierachy
Refactored Window & Modified Hierachy