Improved CSS structure