re-organize css to improve readability