rebase and upd index.html