Merge "Fix text alignment and simplify layouts." into jb-mr1.1-dev