Fixed form field name issue
Fixed some minor bugs