re-working the layout of the samples