Fix display of contents for step 3 (Review text version of a message)
Fix some bugs in the wizard display logic.