organize css and adjust to shorthand