Update index and CSS
merged conflicts on index