Added an optional border size to ShapeButton.
TabbedButtonBar: made sure that when the buttons contain an extra component, the tab's text doesn't overlap it.