[#66][#74] UI fixes