Design tweaks

As discussed with Kaity

Change-Id: I3bd077778f8d9d22378f9b96fdd1c00c3b989e32
Merge "Design tweaks"