Issue 1215

Note: I'm currently working on a refactor which will address this, and also hopefully get rid of a lot of hide/show code in this panel and subpanels (now that panels are no longer shared).