Clean up S3
Font fixes.
Merge branch 'layout_redux'