Add resetting for list style
Mix of other changes and additions