index.html updates
merged with master