Improved UI drawing