Reordered and regrouped the items in the middle to look like this:
or this (when no switching/merging/rebasing is allowed)