re-organize CSS