I agree. It's kinda ugly. 

I'm pushing a new change. Very similar to what you suggested.