am e9e97554: am f8580cf6: A bunch of work on the UI.

Merge commit 'e9e97554814733495459e6b441950a342d60f799'

* commit 'e9e97554814733495459e6b441950a342d60f799':
  A bunch of work on the UI.