Button fixes, button-group