Changed layout and sample history data