Add spacing and remove “conflicting” borders (fix #34)