L10N and display fixes
Post merge fixes