Revert "border fixes"

This reverts commit 956155c293f7fe1e40d789db8cacc3b57fdbc5ee.
try again border fixes