layout fixes
Merge branch 'dev' into test
merge