Merge "Update strings to localize well and change some strings and styles according to the design"