re-organized, fixed a typo, moved submit & reset buttons