am 45f01219: am 50141452: am f876301d: UI Fixes

* commit '45f012197c41e905c84878c0826d01a3d37c15f7':
  UI Fixes