Added fields to specify CSS classes and styles.
Merge branch 'master' into release