pulled in changes from altPanelPos branch