UI code changes

1)Syn UI changes from mainline
2)Infra changes