am f876301d: UI Fixes

* commit 'f876301d0a460bec260a3c7a6ab260a06d5817ba':
  UI Fixes