Fixing nil layout