add main layout
Merge branch 'origin/master'