Fixed ButtonList to match new ClickableContainer format