lots of changes
merge index.html