Reorganized CSS structure