Pop-up dialog issues resolved