More appropriate display

-- Make room for pixels in test layout
-- Check for null in grid toJson