RNDT: changes for widget UI. Fix codelists.