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