Added dialog, fixed crash, fixed navigation disconnect.