Refactored PanelPlace