Moved more attributes into CSS.