make _secondary_panel harder to break
Various fixes