Merged changes in from index-dev.html