Move action chooser to header
Merge