Changed Layouts
Merge branch 'master' into lingjun