added form submit and fixed data