Improve user interface