Improve ui generator refs