#364 Replace save button to heading