completed UI upgrade