Layout changes for #34