Fix to submit buttons