Revert "Revert "dialogues & choices update""

This reverts commit 50fe5d9d10d6f048608abbd5b5ba13c89e88c6ea.