[aphrodite] Compact layout
Merge branch 'compact-layout' into staging