How to Reduce Light Leakage and Gaps