Fixed a merge issue, some padding problems and restored the content_banner block