Fixed a layering issue with the border.