Add margin for buttons
Bugfix: Use dataset, not xtag