Further cleanup
Adding favicon
js cleanup
Merging