Rejiggered CSS structure