Final border update (hopefully), now the border is inside the object, which means other objects can be above the border