updated OverlayButton and ButtonBar