[#805] Ui issues