Remove old 'empty' rows, rename dialog to popup to avoid name confusion