lots of changes to CSS structure