Improved UI design