Callbacks and code improvement
Merge pull request #5 from HaGoijer/feature/ImprovedDialogs

Callbacks and code improvement