Updated to work better with Dialog.  Added some Controls.