fixed border issues