Improvmenets on PDM popup