minor merge fixes

fixed stylesheet typos, carousel nav html.