Update layout to exclude body

Also fix width on some samples