Horizontal Button Group bug fix