majot layout updates and changes.

MUCH easier to read now.