More code enhancement work done
Fix broken JS
Code beautify