Merge "More fine tuning of dialog width"