Admin ui upgrade 2