Buttom group fixes after foundation upgrade