Drawing borders around buttons now encapsulated within ButtonText
Rename booleans
Merge