Starting on some large(ish) changes to CSS structure