CSFIX, moved confirm_label to default_options and tiny refactoring