re-added css, edited out merge comments