[#805] UI fixes