Big fix to add CSS class