Refactor rest of CSS