Changed layouts from 'nil' to 'null'