CSS structure and behaviour improved