Revert "Border change"

This reverts commit 29a6ac601d3e3390cd90a6cfe0f787119ae8a491.
Revert "Revert "Border change""

This reverts commit 780b58ef2fdc3848992c522a31499390ef89fc25.