Options inconsistencies

Fixed an issue where wrapper and label options were always set to their default classes.