Nathan's visual overhaul.
Merge pull request #20 from jabaldwin/master

Nathan's visual overhaul.