BUG:= restore edit popup functionality