[PATCH 2/5] Rework the layout of the list command