Changed discard/save button order, changed in-page buttons to type button fixes #171