Small improvement for form and button