Whoops

Here is the touch draft. Changed some of the discrepancies in CSS.