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