Temp commit for borders.
Border fiddling on toolbar