Big improvements on PanelBuilder