Slight redesign of the button bases