Fix buttons for qa