No need to wrap this in a form. Closes #554