Renamed variable
Added layout object