Dialog module modification and navigation fixed