Massive updates to inlcude content styles
Refactor contentblock layout