layout update
Merge branch 'review_overall' into develop