Add margin for buttons
Bugfix: Use dataset, not xtag
Merge pull request #30 from torhve/develop

Fixes