Improved sample layout