Dialog cleanup
Version 0.9.5