am 445b4825: am fdd9df33: am e9461be3: am f876301d: UI Fixes

* commit '445b48254335f6de9103789273372701d8efb79a':