border issues fixed

border issues fixed