Layout and design changes.

Implemented some of what we talked about. Layout changes and started on the metro design.