Drawing borders around buttons now encapsulated within ButtonText