fix layout null issues

Signed-off-by: budparr <budparr@sonnetmedia.net>