CSS reorganization and tweaks