Layout and styling tweaks

Change-Id: Iad2b2f1c90bd41ebaa968bb1ce23598c68ade02f
Merge "Layout and styling tweaks"