Further CSS structure cleanup