Adjustments to use the new items block CSS which is laid out a bit clearer