Improved sample UI