Improved ui-samples samples