layout changes
Merge branch 'Version0.6'