Continuing to redo styles

Building the HTML back up so the CSS can hook in again