Tweaked and refactored a few things in PanelBase