Commit Seventeen. Continuing to clean up the display dialog.