CSS Reorganization

431