Use the correct markup strings in the dialog, and take care of
some layouting issues.