Cleanup html
Add missing script file
Remove commented out ine
Add js file to tracking
Change heading
Merge branch 'cleanup'
Merge file conflicts