Adding dual layout (cont)
Merge remote-tracking branch 'origin/master'