Merge "More UI tweaks" into nyc-dev am: 8a9fbad
am: 8e07c22

* commit '8e07c223265d382da2039985c4959e9bb0f43fba':
  More UI tweaks

Change-Id: I7e20ffba7a38d1f3a411d26b1262949eb27d4525