Cleanup, add titles to dialogs