Made a lot (but not all) of the design changes.

Pushing the changes made so far. Still waiting for pictures.