Merge "Tweak layouts to make support UI look better." into nyc-mr1-dev