Added a heading size to css
Fixed merge conflicts between 864d214 and cf3e884