Reorganizing css