Revert "Revert "Collapse Enabled Panel""

This reverts commit 344bdcebe020daecef86123c3dfb2aa6a8445941.