[kelvin, neil] X ui updates as per panwar