* Multiple bug fixes * UI changes * More i18n Change-Id: I1efc702262ad64b4b37742b343c9ca31dd3c574a
Change-Id: Iaf7470e0443e4e0124f2b5379045bb2935917f14