CSS refactor and organization