Fixup formatting and submit button behavior