More stylesheet stuff
Fixed index.html merge conflict