Added correct dialog.  Clean up some code
Added correct dialog.  Clean up some code

jerv13/RcmPlugins,innaDa/RcmPlugins,jerv13/RcmPlugins,bjanish/RcmPlugins,innaDa/RcmPlugins,bjanish/RcmPlugins,jerv13/RcmPlugins,innaDa/RcmPlugins,bjanish/RcmPlugins