Updated PanelController