Error handling cleanup
moved help form & submit to template