Layout fix for single row popups
v1.16 rebuild