Make new CSS structure

And grab bits of old CSS to put into the new structure where appropriate