Improve UI design