Here's a top right hand side I photoshopped.

I feel like the change that's coming is really not that satisfactory and would like it better if arranged like this. It's a really minor detail, but I feel like in means of clarity and vision, the one I've thought of is better.