improve listing
add missing block name
use the new modal helper from the AdminBundle
Merge remote-tracking branch 'upstream/master'