Improvements to CSS structure

Improvements to CSS structure to allow no styling on a particular
element, even if there is another element on the page with styling