Fix: Story: Make 'save' button the 'submit' button

Move the 'save' button in front of the 'add comment'
button in the form, so that 'save' is the primary
button that is activated when we press enter while
using the form.