Panel fix, and improved encapsulation