CSS restructuring; minor Tapir modifications