Move save button back within form, fix failing test