On the left an example of how I'm using today, on the right, an example of what I thought may work to have everything at one instance