html, css changes
merged conflicts