ui change.

Let me know what you think. I think this is more readable (you can
always reverse the commit)