Merged changes back into index.html