Merge "Fix several small layout and color issues" into lmp-mr1-dev