clean up time

added js source, cleaned up html and fixed some problems in index.html
Merge branch 'clean_up'