- Continue work with the generic RR UI