app.html now index.html
Fixed merge issues