Further improvements to the embed dialog.