Fix sample layout