styling interior pages
merge conflict fix