fix all pastproject layout errors
Merge branch 'pastprojectlayout1.2'
merge layout fix to master