Move and rename Dialog from LocationHelper