Added main content section blocks + some cleanup