Improved UI features