Major changes.

Made the last of the structural changes; styling.