layout fixes part 1
Merge branch 'origin/private-beta-1-fix'