visual tweaks in html
merge conflicts