Redesign overhaul.

I made things look a little nicer and refined the look of the blocks. I
also cut out some of the un-needed code