Simplify formatters
Fix padding top of content