Added Dialog - more refactoring
Added Dialog - more refactoring