(Re-)Added Dialogs, exit app, removed some test stuff