more layout tweaks
Merge branch 'develop'