fix border issues