more css reorganization