Reorg the markup for styling a bit.