Use "null" instead of "nil" for layout

This resolves #2