Revert 1864478..968e47b

This rolls back to commit 186447838176ad2744cb60dc6ecbe6fa63f171dc.
Simpler and More Visually Pleasing

Think it is pretty much ready to go