Theming, Restructuring

Continuing to theme, restructuring HTML for logical order.