Plugs on A
Radiused corners on B
Shorter finger extensions on A
I would soften the frame edges as well