Improve CSS structure