Layout of List/Filter Options

When filters are forced to wrap in the header section of lists/reports it leaves a lot of white space and I’d like to suggest another way of laying it out, if you don’t mind. 

• Group the Add Column and Add Filter buttons and don’t allow wrapping.
• Group the filters and only wrap them under other filters, not under the buttons, including under the Sort Columns button.

I’ve attached before and after comp to help visualize what I mean.