Sort grouped entries consistent with the usual order
Put entry type prominently in the h1