Here's what we have now:  It should look more like: 
Here's what we have now:
It should look more like: