Remove nesting of content-padded divs