Feature/nge 18 pop up screen before mandl