[#805] Further Ui amendments