Fixing whitespace
Fix the layout nil errors