Changed some id attributes to name and changed name of input