registration fixes
index.html remote merge