Improved UI Design