Change-Id: I2071ee8143e040c552f56f204e863c7dc90da872
* UX fixes * More localization Change-Id: I9f0345cbd4b785f4293ab02fe0006df5c7377cd1