Re-organize CSS