Retooled modal presentation.

Change-Id: I2c2776e217f215de58fd51bb7eab0d6ba01d8caa