Minor changes to view, locale and sample-config files after merge