UI usability improvement