[tb] ui and code update