Fixed some stuff
JS changes
Additional changes
JS changes
Removed some js files