Restructure blocks to not include info block on all pages