Feature/major rewrite for content websites