Better organization of content blocks