Refactor CSS into separate classes