refitted Samples with popup editors