Fixed strutcure of index.html and css
Fixed merge