Modified according to igloo layouts update