Quick fixes for #1 and #2 + index.html