Replaced all echoes with dialog implementations