added styles to index.html
fix merge conflicts