CORE-392 restoring buttons on Save and Add Another Response