finished the css reoorganization