Partial restructure to Layered Pane