[#805] Ui amendments continued