change label in action chooser + minor changes