In form 16 ER PAN no is not displayed clearly

Dear experts,

1.  My issue is:  In form 16 ER PAN no is not displayed clearly (Here PAN & GIR NO overlapping)

    Please help me.

2. F16 ER address should pickup form Company code ( can u help me on this Badi activate >>> Badi:Determine address of Er based on diffrent parameters)

Thanks,

Ajay.