Issue #307 Updates for panels