Moved more attributes to styles