Cleanup

All Dialogs in one Class