CSS reorganization