Updated some small border issues