Redesign

Hey Robert, thanks for making these changes for Johnny Law. I'll flip the production server over to this branch right away since I know John wants this stuff up ASAP. 

Figured I'd open a PR to point out a few things that I noticed before merging this into master. Word.