Reorganized some CSS