Checking in some modal dialog changes for config.

Signed-off-by: Vishal Sood <vishalsood@gmail.com>