More block formatting (tweaked the grouping rules).
WIP