Fixed Layout 1,2. still have error out of memory
Merge remote-tracking branch 'origin/master'