Update with external js and css tweaks
Merge index