removed best in place and delete links, modal autofocus
merge