Minor changes to some views and strings.xml