working on the border overflow issue