Fixed messy merge, update DialogView to use push/pop state