Rework popup configuration