fixs index
fixs form
Merge pull request #541 from MGhanem/fix_index

Fix index