reorganizes js and makes form field function
merge
Merge pull request #61 from KevinFXue/jjavascriptfix

Jjavascriptfix