Unify button order in dialogs
Merge branch 'release/v0.2.1'