Fix draw-order for border.