Improve the way borders work