Fixed and improved batch operation layout

Fixes #1539