Shift some nested styles out; use main and section tags