Every time I see this I want to scream

I think all in a row like you have shown is much better. Much easier to read and use.

I hate to throw the word crowdsourcing out there, but this is a pretty good example of using the designers on the forum to help make improvements!