Changed how the dialogs render text.
Cleaned solution