UI code changes

1) Syncing UI code from mainline
2) Some infra changes