[#805] Various UI fixes