added custom borders
merged