diff --git a/drupal/code/modules/features/kada_contact_information_feature/kada_contact_information_feature.ds.inc b/drupal/code/modules/features/kada_contact_information_feature/kada_contact_information_feature.ds.inc
index 65517d741..b8a86b3b0 100755
--- a/drupal/code/modules/features/kada_contact_information_feature/kada_contact_information_feature.ds.inc
+++ b/drupal/code/modules/features/kada_contact_information_feature/kada_contact_information_feature.ds.inc
@@ -19,58 +19,10 @@ function kada_contact_information_feature_ds_field_settings_info() {
   $ds_fieldsetting->view_mode = 'default';
   $ds_fieldsetting->settings = array(
     'add_position_link' => array(
-      'weight' => '10',
-      'label' => 'hidden',
-      'format' => 'default',
-    ),
-    'positions_of_trust' => array(
       'weight' => '9',
       'label' => 'hidden',
       'format' => 'default',
     ),
-    'field_email_single' => array(
-      'formatter_settings' => array(
-        'ft' => array(
-          'func' => 'theme_ds_field_expert',
-          'ow' => TRUE,
-          'ow-el' => 'div',
-          'ow-cl' => 'person__email',
-          'ow-def-cl' => FALSE,
-          'ow-at' => '',
-          'ow-def-at' => FALSE,
-        ),
-      ),
-    ),
-    'field_first_name' => array(
-      'formatter_settings' => array(
-        'ft' => array(
-          'func' => 'theme_ds_field_expert',
-          'prefix' => '<h1 class="person__name">',
-        ),
-      ),
-    ),
-    'field_person_image' => array(
-      'formatter_settings' => array(
-        'ft' => array(
-          'func' => 'theme_ds_field_expert',
-          'ow' => TRUE,
-          'ow-el' => 'div',
-          'ow-cl' => 'person__image',
-          'ow-def-cl' => FALSE,
-          'ow-at' => '',
-          'ow-def-at' => FALSE,
-        ),
-      ),
-    ),
-    'field_surname' => array(
-      'formatter_settings' => array(
-        'ft' => array(
-          'func' => 'theme_ds_field_expert',
-          'prefix' => '&nbsp;',
-          'suffix' => '</h1>',
-        ),
-      ),
-    ),
   );
   $export['node|person|default'] = $ds_fieldsetting;
 
@@ -369,20 +321,19 @@ function kada_contact_information_feature_ds_layout_settings_info() {
         3 => 'field_email_single',
         4 => 'group_htabs',
         5 => 'field_profession',
-        6 => 'field_political_party',
-        7 => 'field_mobile_phone',
-        8 => 'positions_of_trust',
-        9 => 'add_position_link',
-        10 => 'field_employee_title',
-        11 => 'field_office_tr',
-        12 => 'field_task_description',
-        13 => 'field_superior',
-        14 => 'field_phone',
-        15 => 'field_mobile_phone_work',
-        16 => 'field_phone_switch',
-        17 => 'group_employee',
-        18 => 'group_trustee',
-        19 => 'field_fax_number',
+        6 => 'field_mobile_phone',
+        7 => 'field_political_party',
+        8 => 'add_position_link',
+        9 => 'field_employee_title',
+        10 => 'field_office_tr',
+        11 => 'field_task_description',
+        12 => 'field_superior',
+        13 => 'field_phone',
+        14 => 'field_mobile_phone_work',
+        15 => 'group_employee',
+        16 => 'group_trustee',
+        17 => 'field_phone_switch',
+        18 => 'field_fax_number',
       ),
     ),
     'fields' => array(
@@ -392,9 +343,8 @@ function kada_contact_information_feature_ds_layout_settings_info() {
       'field_email_single' => 'ds_content',
       'group_htabs' => 'ds_content',
       'field_profession' => 'ds_content',
-      'field_political_party' => 'ds_content',
       'field_mobile_phone' => 'ds_content',
-      'positions_of_trust' => 'ds_content',
+      'field_political_party' => 'ds_content',
       'add_position_link' => 'ds_content',
       'field_employee_title' => 'ds_content',
       'field_office_tr' => 'ds_content',
@@ -402,9 +352,9 @@ function kada_contact_information_feature_ds_layout_settings_info() {
       'field_superior' => 'ds_content',
       'field_phone' => 'ds_content',
       'field_mobile_phone_work' => 'ds_content',
-      'field_phone_switch' => 'ds_content',
       'group_employee' => 'ds_content',
       'group_trustee' => 'ds_content',
+      'field_phone_switch' => 'ds_content',
       'field_fax_number' => 'ds_content',
     ),
     'classes' => array(),
@@ -416,6 +366,7 @@ function kada_contact_information_feature_ds_layout_settings_info() {
     'layout_attributes_merge' => 1,
     'layout_link_attribute' => '',
     'layout_link_custom' => '',
+    'layout_disable_css' => FALSE,
   );
   $export['node|person|default'] = $ds_layout;
 
diff --git a/drupal/code/modules/features/kada_contact_information_feature/kada_contact_information_feature.features.field_instance.inc b/drupal/code/modules/features/kada_contact_information_feature/kada_contact_information_feature.features.field_instance.inc
index f761240cd..1481e1859 100755
--- a/drupal/code/modules/features/kada_contact_information_feature/kada_contact_information_feature.features.field_instance.inc
+++ b/drupal/code/modules/features/kada_contact_information_feature/kada_contact_information_feature.features.field_instance.inc
@@ -97,7 +97,7 @@ function kada_contact_information_feature_field_default_field_instances() {
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 30,
+        'weight' => 32,
       ),
       'full' => array(
         'label' => 'above',
@@ -206,7 +206,7 @@ function kada_contact_information_feature_field_default_field_instances() {
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 16,
+        'weight' => 24,
       ),
       'full' => array(
         'label' => 'above',
@@ -495,7 +495,7 @@ function kada_contact_information_feature_field_default_field_instances() {
         'module' => 'text',
         'settings' => array(),
         'type' => 'text_default',
-        'weight' => 19,
+        'weight' => 20,
       ),
       'full' => array(
         'label' => 'inline',
@@ -740,7 +740,7 @@ function kada_contact_information_feature_field_default_field_instances() {
         'module' => 'text',
         'settings' => array(),
         'type' => 'text_default',
-        'weight' => 8,
+        'weight' => 7,
       ),
       'full' => array(
         'label' => 'inline',
@@ -863,7 +863,7 @@ function kada_contact_information_feature_field_default_field_instances() {
         'module' => 'text',
         'settings' => array(),
         'type' => 'text_default',
-        'weight' => 17,
+        'weight' => 18,
       ),
       'full' => array(
         'label' => 'inline',
@@ -985,7 +985,7 @@ function kada_contact_information_feature_field_default_field_instances() {
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 24,
+        'weight' => 28,
       ),
       'full' => array(
         'label' => 'inline',
@@ -1275,7 +1275,7 @@ function kada_contact_information_feature_field_default_field_instances() {
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 28,
+        'weight' => 31,
       ),
       'full' => array(
         'label' => 'above',
@@ -1467,7 +1467,7 @@ function kada_contact_information_feature_field_default_field_instances() {
         'module' => 'text',
         'settings' => array(),
         'type' => 'text_default',
-        'weight' => 18,
+        'weight' => 19,
       ),
       'full' => array(
         'label' => 'inline',
@@ -1594,7 +1594,7 @@ function kada_contact_information_feature_field_default_field_instances() {
           'link' => FALSE,
         ),
         'type' => 'entityreference_label',
-        'weight' => 7,
+        'weight' => 8,
       ),
       'full' => array(
         'label' => 'inline',
@@ -1686,7 +1686,7 @@ function kada_contact_information_feature_field_default_field_instances() {
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 25,
+        'weight' => 29,
       ),
       'full' => array(
         'label' => 'inline',
@@ -1918,7 +1918,7 @@ function kada_contact_information_feature_field_default_field_instances() {
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 23,
+        'weight' => 27,
       ),
       'full' => array(
         'label' => 'inline',
@@ -2359,7 +2359,7 @@ function kada_contact_information_feature_field_default_field_instances() {
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 26,
+        'weight' => 30,
       ),
       'full' => array(
         'label' => 'inline',
@@ -2472,7 +2472,7 @@ function kada_contact_information_feature_field_default_field_instances() {
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 22,
+        'weight' => 26,
       ),
       'full' => array(
         'label' => 'above',
diff --git a/drupal/code/modules/features/kada_contact_information_feature/kada_contact_information_feature.field_group.inc b/drupal/code/modules/features/kada_contact_information_feature/kada_contact_information_feature.field_group.inc
index f1e9203bf..11ad41214 100644
--- a/drupal/code/modules/features/kada_contact_information_feature/kada_contact_information_feature.field_group.inc
+++ b/drupal/code/modules/features/kada_contact_information_feature/kada_contact_information_feature.field_group.inc
@@ -411,7 +411,6 @@ function kada_contact_information_feature_field_group_info() {
       1 => 'field_political_party',
       2 => 'field_profession',
       3 => 'add_position_link',
-      4 => 'positions_of_trust',
     ),
     'format_type' => 'htab',
     'format_settings' => array(
diff --git a/drupal/code/modules/features/kada_contact_information_feature/kada_contact_information_feature.strongarm.inc b/drupal/code/modules/features/kada_contact_information_feature/kada_contact_information_feature.strongarm.inc
index 2698ff4da..6bf1483c0 100644
--- a/drupal/code/modules/features/kada_contact_information_feature/kada_contact_information_feature.strongarm.inc
+++ b/drupal/code/modules/features/kada_contact_information_feature/kada_contact_information_feature.strongarm.inc
@@ -432,6 +432,12 @@ function kada_contact_information_feature_strongarm() {
       'waste_search' => array(
         'custom_settings' => FALSE,
       ),
+      'current_twitter' => array(
+        'custom_settings' => FALSE,
+      ),
+      'presentation' => array(
+        'custom_settings' => FALSE,
+      ),
     ),
     'extra_fields' => array(
       'form' => array(
@@ -454,7 +460,7 @@ function kada_contact_information_feature_strongarm() {
       'display' => array(
         'domain' => array(
           'default' => array(
-            'weight' => '21',
+            'weight' => '25',
             'visible' => FALSE,
           ),
           'only_title' => array(
@@ -484,7 +490,7 @@ function kada_contact_information_feature_strongarm() {
         ),
         'sharethis' => array(
           'default' => array(
-            'weight' => '10',
+            'weight' => '23',
             'visible' => FALSE,
           ),
           'person_card_with_skills' => array(
diff --git a/drupal/code/modules/features/kada_contact_information_feature/kada_contact_information_feature.views_default.inc b/drupal/code/modules/features/kada_contact_information_feature/kada_contact_information_feature.views_default.inc
index 7659ec0af..b014b6d34 100755
--- a/drupal/code/modules/features/kada_contact_information_feature/kada_contact_information_feature.views_default.inc
+++ b/drupal/code/modules/features/kada_contact_information_feature/kada_contact_information_feature.views_default.inc
@@ -33,13 +33,22 @@ function kada_contact_information_feature_views_default_views() {
   $handler->display->display_options['query']['type'] = 'views_query';
   $handler->display->display_options['query']['options']['distinct'] = TRUE;
   $handler->display->display_options['exposed_form']['type'] = 'basic';
-  $handler->display->display_options['exposed_form']['options']['submit_button'] = 'Filter';
+  $handler->display->display_options['exposed_form']['options']['submit_button'] = 'Suodata';
   $handler->display->display_options['exposed_form']['options']['reset_button'] = TRUE;
+  $handler->display->display_options['exposed_form']['options']['reset_button_label'] = 'Palauta oletusarvoihin';
+  $handler->display->display_options['exposed_form']['options']['exposed_sorts_label'] = 'Järjestele';
+  $handler->display->display_options['exposed_form']['options']['sort_asc_label'] = 'Nou';
+  $handler->display->display_options['exposed_form']['options']['sort_desc_label'] = 'Las';
   $handler->display->display_options['pager']['type'] = 'full';
   $handler->display->display_options['pager']['options']['items_per_page'] = '50';
   $handler->display->display_options['pager']['options']['offset'] = '0';
   $handler->display->display_options['pager']['options']['id'] = '0';
   $handler->display->display_options['pager']['options']['quantity'] = '9';
+  $handler->display->display_options['pager']['options']['expose']['items_per_page_label'] = 'Tuloksia sivulla';
+  $handler->display->display_options['pager']['options']['tags']['first'] = '« ensimmäinen';
+  $handler->display->display_options['pager']['options']['tags']['previous'] = '‹ edellinen';
+  $handler->display->display_options['pager']['options']['tags']['next'] = 'seuraava ›';
+  $handler->display->display_options['pager']['options']['tags']['last'] = 'viimeinen »';
   $handler->display->display_options['style_plugin'] = 'table';
   $handler->display->display_options['style_options']['columns'] = array(
     'field_person_image' => 'field_person_image',
@@ -110,11 +119,11 @@ function kada_contact_information_feature_views_default_views() {
       'empty_column' => 0,
     ),
   );
-  /* Header: Global: Result summary */
+  /* Otsikko: Global: Result summary */
   $handler->display->display_options['header']['result']['id'] = 'result';
   $handler->display->display_options['header']['result']['table'] = 'views';
   $handler->display->display_options['header']['result']['field'] = 'result';
-  /* Relationship: Content: Taxonomy terms on node */
+  /* Relationship: Sisältö: Taxonomy terms on node */
   $handler->display->display_options['relationships']['term_node_tid']['id'] = 'term_node_tid';
   $handler->display->display_options['relationships']['term_node_tid']['table'] = 'node';
   $handler->display->display_options['relationships']['term_node_tid']['field'] = 'term_node_tid';
@@ -133,7 +142,7 @@ function kada_contact_information_feature_views_default_views() {
     'trust_unit' => 0,
     'trustee_role' => 0,
   );
-  /* Field: Bulk operations: Content */
+  /* Kenttä: Bulk operations: Sisältö */
   $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
   $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'views_entity_node';
   $handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations';
@@ -178,7 +187,7 @@ function kada_contact_information_feature_views_default_views() {
       'label' => '',
     ),
   );
-  /* Field: Content: Person image */
+  /* Kenttä: Sisältö: Person image */
   $handler->display->display_options['fields']['field_person_image']['id'] = 'field_person_image';
   $handler->display->display_options['fields']['field_person_image']['table'] = 'field_data_field_person_image';
   $handler->display->display_options['fields']['field_person_image']['field'] = 'field_person_image';
@@ -188,82 +197,85 @@ function kada_contact_information_feature_views_default_views() {
   $handler->display->display_options['fields']['field_person_image']['settings'] = array(
     'link' => '0',
   );
-  /* Field: Content: Title */
+  /* Kenttä: Sisältö: Otsikko */
   $handler->display->display_options['fields']['title']['id'] = 'title';
   $handler->display->display_options['fields']['title']['table'] = 'node';
   $handler->display->display_options['fields']['title']['field'] = 'title';
   $handler->display->display_options['fields']['title']['label'] = 'Title (drupal)';
   $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
   $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
-  /* Field: Content: Person type */
+  /* Kenttä: Sisältö: Person type */
   $handler->display->display_options['fields']['field_person_type']['id'] = 'field_person_type';
   $handler->display->display_options['fields']['field_person_type']['table'] = 'field_data_field_person_type';
   $handler->display->display_options['fields']['field_person_type']['field'] = 'field_person_type';
-  $handler->display->display_options['fields']['field_person_type']['label'] = 'Type';
+  $handler->display->display_options['fields']['field_person_type']['label'] = 'Tyyppi';
   $handler->display->display_options['fields']['field_person_type']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['field_person_type']['delta_offset'] = '0';
-  /* Field: Content: Office */
+  /* Kenttä: Sisältö: Office */
   $handler->display->display_options['fields']['field_office_tr']['id'] = 'field_office_tr';
   $handler->display->display_options['fields']['field_office_tr']['table'] = 'field_data_field_office_tr';
   $handler->display->display_options['fields']['field_office_tr']['field'] = 'field_office_tr';
+  $handler->display->display_options['fields']['field_office_tr']['label'] = 'Yksikkö';
   $handler->display->display_options['fields']['field_office_tr']['type'] = 'hs_taxonomy_term_reference_hierarchical_text';
   $handler->display->display_options['fields']['field_office_tr']['delta_offset'] = '0';
-  /* Field: Content: Title */
+  /* Kenttä: Sisältö: Title */
   $handler->display->display_options['fields']['field_employee_title']['id'] = 'field_employee_title';
   $handler->display->display_options['fields']['field_employee_title']['table'] = 'field_data_field_employee_title';
   $handler->display->display_options['fields']['field_employee_title']['field'] = 'field_employee_title';
   $handler->display->display_options['fields']['field_employee_title']['label'] = 'Work title';
-  /* Field: Content: Political party */
+  /* Kenttä: Sisältö: Political party */
   $handler->display->display_options['fields']['field_political_party']['id'] = 'field_political_party';
   $handler->display->display_options['fields']['field_political_party']['table'] = 'field_data_field_political_party';
   $handler->display->display_options['fields']['field_political_party']['field'] = 'field_political_party';
+  $handler->display->display_options['fields']['field_political_party']['label'] = 'Puolue';
   $handler->display->display_options['fields']['field_political_party']['settings'] = array(
     'link' => 0,
   );
-  /* Field: Content: Profession */
+  /* Kenttä: Sisältö: Profession */
   $handler->display->display_options['fields']['field_profession']['id'] = 'field_profession';
   $handler->display->display_options['fields']['field_profession']['table'] = 'field_data_field_profession';
   $handler->display->display_options['fields']['field_profession']['field'] = 'field_profession';
-  /* Field: Content: Edit link */
+  $handler->display->display_options['fields']['field_profession']['label'] = 'Ammatti';
+  /* Kenttä: Sisältö: Edit link */
   $handler->display->display_options['fields']['edit_node']['id'] = 'edit_node';
   $handler->display->display_options['fields']['edit_node']['table'] = 'views_entity_node';
   $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
   $handler->display->display_options['fields']['edit_node']['label'] = '';
   $handler->display->display_options['fields']['edit_node']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['edit_node']['text'] = 'edit';
-  /* Field: Content: Delete link */
+  $handler->display->display_options['fields']['edit_node']['text'] = 'muokkaa';
+  /* Kenttä: Sisältö: Delete link */
   $handler->display->display_options['fields']['delete_node']['id'] = 'delete_node';
   $handler->display->display_options['fields']['delete_node']['table'] = 'views_entity_node';
   $handler->display->display_options['fields']['delete_node']['field'] = 'delete_node';
   $handler->display->display_options['fields']['delete_node']['label'] = '';
   $handler->display->display_options['fields']['delete_node']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['delete_node']['text'] = 'delete';
-  /* Sort criterion: Content: Title */
+  $handler->display->display_options['fields']['delete_node']['text'] = 'poista';
+  /* Sort criterion: Sisältö: Otsikko */
   $handler->display->display_options['sorts']['title']['id'] = 'title';
   $handler->display->display_options['sorts']['title']['table'] = 'node';
   $handler->display->display_options['sorts']['title']['field'] = 'title';
-  /* Filter criterion: Content: Published */
+  /* Filter criterion: Sisältö: Julkaistu */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
   $handler->display->display_options['filters']['status']['field'] = 'status';
   $handler->display->display_options['filters']['status']['value'] = 1;
   $handler->display->display_options['filters']['status']['group'] = 1;
   $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
-  /* Filter criterion: Content: Type */
+  /* Filter criterion: Sisältö: Tyyppi */
   $handler->display->display_options['filters']['type']['id'] = 'type';
   $handler->display->display_options['filters']['type']['table'] = 'node';
   $handler->display->display_options['filters']['type']['field'] = 'type';
   $handler->display->display_options['filters']['type']['value'] = array(
     'person' => 'person',
   );
-  /* Filter criterion: Content: Title */
+  /* Filter criterion: Sisältö: Otsikko */
   $handler->display->display_options['filters']['title']['id'] = 'title';
   $handler->display->display_options['filters']['title']['table'] = 'node';
   $handler->display->display_options['filters']['title']['field'] = 'title';
   $handler->display->display_options['filters']['title']['operator'] = 'contains';
   $handler->display->display_options['filters']['title']['exposed'] = TRUE;
   $handler->display->display_options['filters']['title']['expose']['operator_id'] = 'title_op';
-  $handler->display->display_options['filters']['title']['expose']['label'] = 'Title';
+  $handler->display->display_options['filters']['title']['expose']['label'] = 'Otsikko';
   $handler->display->display_options['filters']['title']['expose']['operator'] = 'title_op';
   $handler->display->display_options['filters']['title']['expose']['identifier'] = 'title';
   $handler->display->display_options['filters']['title']['expose']['remember_roles'] = array(
@@ -274,13 +286,13 @@ function kada_contact_information_feature_views_default_views() {
     3 => 0,
     6 => 0,
   );
-  /* Filter criterion: Content: Person type (field_person_type) */
+  /* Filter criterion: Sisältö: Person type (field_person_type) */
   $handler->display->display_options['filters']['field_person_type_value']['id'] = 'field_person_type_value';
   $handler->display->display_options['filters']['field_person_type_value']['table'] = 'field_data_field_person_type';
   $handler->display->display_options['filters']['field_person_type_value']['field'] = 'field_person_type_value';
   $handler->display->display_options['filters']['field_person_type_value']['exposed'] = TRUE;
   $handler->display->display_options['filters']['field_person_type_value']['expose']['operator_id'] = 'field_person_type_value_op';
-  $handler->display->display_options['filters']['field_person_type_value']['expose']['label'] = 'Type';
+  $handler->display->display_options['filters']['field_person_type_value']['expose']['label'] = 'Tyyppi';
   $handler->display->display_options['filters']['field_person_type_value']['expose']['operator'] = 'field_person_type_value_op';
   $handler->display->display_options['filters']['field_person_type_value']['expose']['identifier'] = 'field_person_type_value';
   $handler->display->display_options['filters']['field_person_type_value']['expose']['remember_roles'] = array(
@@ -291,13 +303,13 @@ function kada_contact_information_feature_views_default_views() {
     3 => 0,
     6 => 0,
   );
-  /* Filter criterion: Content: Office (field_office_tr) */
+  /* Filter criterion: Sisältö: Office (field_office_tr) */
   $handler->display->display_options['filters']['field_office_tr_tid']['id'] = 'field_office_tr_tid';
   $handler->display->display_options['filters']['field_office_tr_tid']['table'] = 'field_data_field_office_tr';
   $handler->display->display_options['filters']['field_office_tr_tid']['field'] = 'field_office_tr_tid';
   $handler->display->display_options['filters']['field_office_tr_tid']['exposed'] = TRUE;
   $handler->display->display_options['filters']['field_office_tr_tid']['expose']['operator_id'] = 'field_office_tr_tid_op';
-  $handler->display->display_options['filters']['field_office_tr_tid']['expose']['label'] = 'Office';
+  $handler->display->display_options['filters']['field_office_tr_tid']['expose']['label'] = 'Yksikkö';
   $handler->display->display_options['filters']['field_office_tr_tid']['expose']['operator'] = 'field_office_tr_tid_op';
   $handler->display->display_options['filters']['field_office_tr_tid']['expose']['identifier'] = 'field_office_tr_tid';
   $handler->display->display_options['filters']['field_office_tr_tid']['expose']['remember_roles'] = array(
@@ -308,7 +320,7 @@ function kada_contact_information_feature_views_default_views() {
     3 => 0,
     6 => 0,
   );
-  $handler->display->display_options['filters']['field_office_tr_tid']['group_info']['label'] = 'Office (field_office_tr)';
+  $handler->display->display_options['filters']['field_office_tr_tid']['group_info']['label'] = 'Yksikkö';
   $handler->display->display_options['filters']['field_office_tr_tid']['group_info']['identifier'] = 'field_office_tr_tid';
   $handler->display->display_options['filters']['field_office_tr_tid']['group_info']['group_items'] = array(
     1 => array(
@@ -344,32 +356,31 @@ function kada_contact_information_feature_views_default_views() {
     t('Master'),
     t('KADA Persons'),
     t('more'),
-    t('Filter'),
-    t('Reset'),
-    t('Sort by'),
-    t('Asc'),
-    t('Desc'),
-    t('Items per page'),
+    t('Suodata'),
+    t('Palauta oletusarvoihin'),
+    t('Järjestele'),
+    t('Nou'),
+    t('Las'),
+    t('Tuloksia sivulla'),
     t('- All -'),
     t('Offset'),
-    t('« first'),
-    t('‹ previous'),
-    t('next ›'),
-    t('last »'),
+    t('« ensimmäinen'),
+    t('‹ edellinen'),
+    t('seuraava ›'),
+    t('viimeinen »'),
     t('Displaying @start - @end of @total'),
     t('term'),
-    t('Content'),
-    t('- Choose an operation -'),
+    t('Sisältö'),
+    t('- Valitse toimenpide -'),
     t('Title (drupal)'),
-    t('Type'),
-    t('Office'),
+    t('Tyyppi'),
+    t('Yksikkö'),
     t('Work title'),
-    t('Political party'),
-    t('Profession'),
-    t('edit'),
-    t('delete'),
-    t('Title'),
-    t('Office (field_office_tr)'),
+    t('Puolue'),
+    t('Ammatti'),
+    t('muokkaa'),
+    t('poista'),
+    t('Otsikko'),
     t('Page'),
   );
   $export['kada_persons'] = $view;
@@ -386,13 +397,17 @@ function kada_contact_information_feature_views_default_views() {
 
   /* Display: Master */
   $handler = $view->new_display('default', 'Master', 'default');
-  $handler->display->display_options['title'] = 'Positions of trust';
+  $handler->display->display_options['title'] = 'Luottamustehtävät';
   $handler->display->display_options['use_more_always'] = FALSE;
   $handler->display->display_options['access']['type'] = 'perm';
   $handler->display->display_options['cache']['type'] = 'none';
   $handler->display->display_options['query']['type'] = 'views_query';
   $handler->display->display_options['exposed_form']['type'] = 'basic';
+  $handler->display->display_options['exposed_form']['options']['submit_button'] = 'Hae';
   $handler->display->display_options['exposed_form']['options']['reset_button_label'] = 'Palauta oletusarvoihin';
+  $handler->display->display_options['exposed_form']['options']['exposed_sorts_label'] = 'Järjestele';
+  $handler->display->display_options['exposed_form']['options']['sort_asc_label'] = 'Nou';
+  $handler->display->display_options['exposed_form']['options']['sort_desc_label'] = 'Las';
   $handler->display->display_options['pager']['type'] = 'none';
   $handler->display->display_options['pager']['options']['offset'] = '0';
   $handler->display->display_options['style_plugin'] = 'views_accordion';
@@ -407,10 +422,11 @@ function kada_contact_information_feature_views_default_views() {
   $handler->display->display_options['relationships']['relation_trustee_person_node']['table'] = 'node';
   $handler->display->display_options['relationships']['relation_trustee_person_node']['field'] = 'relation_trustee_person_node';
   $handler->display->display_options['relationships']['relation_trustee_person_node']['ui_name'] = 'Trustee';
+  $handler->display->display_options['relationships']['relation_trustee_person_node']['label'] = 'Luottamushenkilö';
   $handler->display->display_options['relationships']['relation_trustee_person_node']['r_index'] = '0';
   $handler->display->display_options['relationships']['relation_trustee_person_node']['entity_deduplication_left'] = 0;
   $handler->display->display_options['relationships']['relation_trustee_person_node']['entity_deduplication_right'] = 0;
-  /* Field: Trust unit, Role */
+  /* Kenttä: Trust unit, Role */
   $handler->display->display_options['fields']['rendered_entity_1']['id'] = 'rendered_entity_1';
   $handler->display->display_options['fields']['rendered_entity_1']['table'] = 'views_entity_node';
   $handler->display->display_options['fields']['rendered_entity_1']['field'] = 'rendered_entity';
@@ -421,7 +437,7 @@ function kada_contact_information_feature_views_default_views() {
   $handler->display->display_options['fields']['rendered_entity_1']['display'] = 'view';
   $handler->display->display_options['fields']['rendered_entity_1']['view_mode'] = 'only_title';
   $handler->display->display_options['fields']['rendered_entity_1']['bypass_access'] = 0;
-  /* Field: Accordion content */
+  /* Kenttä: Accordion content */
   $handler->display->display_options['fields']['rendered_entity']['id'] = 'rendered_entity';
   $handler->display->display_options['fields']['rendered_entity']['table'] = 'views_entity_node';
   $handler->display->display_options['fields']['rendered_entity']['field'] = 'rendered_entity';
@@ -432,7 +448,7 @@ function kada_contact_information_feature_views_default_views() {
   $handler->display->display_options['fields']['rendered_entity']['display'] = 'view';
   $handler->display->display_options['fields']['rendered_entity']['view_mode'] = 'accordion';
   $handler->display->display_options['fields']['rendered_entity']['bypass_access'] = 0;
-  /* Field: Content: Edit link */
+  /* Kenttä: Sisältö: Edit link */
   $handler->display->display_options['fields']['edit_node']['id'] = 'edit_node';
   $handler->display->display_options['fields']['edit_node']['table'] = 'views_entity_node';
   $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
@@ -443,7 +459,7 @@ function kada_contact_information_feature_views_default_views() {
   $handler->display->display_options['fields']['edit_node']['element_wrapper_type'] = '0';
   $handler->display->display_options['fields']['edit_node']['element_default_classes'] = FALSE;
   $handler->display->display_options['fields']['edit_node']['text'] = 'Edit position';
-  /* Field: Content: Delete link */
+  /* Kenttä: Sisältö: Delete link */
   $handler->display->display_options['fields']['delete_node']['id'] = 'delete_node';
   $handler->display->display_options['fields']['delete_node']['table'] = 'views_entity_node';
   $handler->display->display_options['fields']['delete_node']['field'] = 'delete_node';
@@ -454,7 +470,7 @@ function kada_contact_information_feature_views_default_views() {
   $handler->display->display_options['fields']['delete_node']['element_wrapper_type'] = '0';
   $handler->display->display_options['fields']['delete_node']['element_default_classes'] = FALSE;
   $handler->display->display_options['fields']['delete_node']['text'] = 'Delete position';
-  /* Contextual filter: Content: Nid */
+  /* Contextual filter: Sisältö: Nid */
   $handler->display->display_options['arguments']['nid']['id'] = 'nid';
   $handler->display->display_options['arguments']['nid']['table'] = 'node';
   $handler->display->display_options['arguments']['nid']['field'] = 'nid';
@@ -465,14 +481,14 @@ function kada_contact_information_feature_views_default_views() {
   $handler->display->display_options['arguments']['nid']['summary']['number_of_records'] = '0';
   $handler->display->display_options['arguments']['nid']['summary']['format'] = 'default_summary';
   $handler->display->display_options['arguments']['nid']['summary_options']['items_per_page'] = '25';
-  /* Filter criterion: Content: Published */
+  /* Filter criterion: Sisältö: Julkaistu */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
   $handler->display->display_options['filters']['status']['field'] = 'status';
   $handler->display->display_options['filters']['status']['value'] = 1;
   $handler->display->display_options['filters']['status']['group'] = 1;
   $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
-  /* Filter criterion: Content: Type */
+  /* Filter criterion: Sisältö: Tyyppi */
   $handler->display->display_options['filters']['type']['id'] = 'type';
   $handler->display->display_options['filters']['type']['table'] = 'node';
   $handler->display->display_options['filters']['type']['field'] = 'type';
@@ -488,7 +504,7 @@ function kada_contact_information_feature_views_default_views() {
   $handler = $view->new_display('block', 'Search result', 'search');
   $handler->display->display_options['display_description'] = 'List of positions for search result display mode';
   $handler->display->display_options['defaults']['fields'] = FALSE;
-  /* Field: Trust unit, Role */
+  /* Kenttä: Trust unit, Role */
   $handler->display->display_options['fields']['rendered_entity_1']['id'] = 'rendered_entity_1';
   $handler->display->display_options['fields']['rendered_entity_1']['table'] = 'views_entity_node';
   $handler->display->display_options['fields']['rendered_entity_1']['field'] = 'rendered_entity';
@@ -501,14 +517,14 @@ function kada_contact_information_feature_views_default_views() {
   $handler->display->display_options['fields']['rendered_entity_1']['bypass_access'] = 0;
   $translatables['kada_positions_of_trust'] = array(
     t('Master'),
-    t('Positions of trust'),
+    t('Luottamustehtävät'),
     t('more'),
-    t('Apply'),
+    t('Hae'),
     t('Palauta oletusarvoihin'),
-    t('Sort by'),
-    t('Asc'),
-    t('Desc'),
-    t('Trustee person'),
+    t('Järjestele'),
+    t('Nou'),
+    t('Las'),
+    t('Luottamushenkilö'),
     t('Edit position'),
     t('Delete position'),
     t('Kaikki'),
@@ -538,7 +554,11 @@ function kada_contact_information_feature_views_default_views() {
   $handler->display->display_options['query']['options']['disable_sql_rewrite'] = TRUE;
   $handler->display->display_options['query']['options']['distinct'] = TRUE;
   $handler->display->display_options['exposed_form']['type'] = 'basic';
+  $handler->display->display_options['exposed_form']['options']['submit_button'] = 'Hae';
   $handler->display->display_options['exposed_form']['options']['reset_button_label'] = 'Palauta oletusarvoihin';
+  $handler->display->display_options['exposed_form']['options']['exposed_sorts_label'] = 'Järjestele';
+  $handler->display->display_options['exposed_form']['options']['sort_asc_label'] = 'Nou';
+  $handler->display->display_options['exposed_form']['options']['sort_desc_label'] = 'Las';
   $handler->display->display_options['pager']['type'] = 'none';
   $handler->display->display_options['pager']['options']['offset'] = '0';
   $handler->display->display_options['style_plugin'] = 'default';
@@ -549,6 +569,7 @@ function kada_contact_information_feature_views_default_views() {
   $handler->display->display_options['relationships']['relation_trustee_person_node']['table'] = 'node';
   $handler->display->display_options['relationships']['relation_trustee_person_node']['field'] = 'relation_trustee_person_node';
   $handler->display->display_options['relationships']['relation_trustee_person_node']['ui_name'] = 'Trustee';
+  $handler->display->display_options['relationships']['relation_trustee_person_node']['label'] = 'Luottamushenkilö';
   $handler->display->display_options['relationships']['relation_trustee_person_node']['r_index'] = '0';
   $handler->display->display_options['relationships']['relation_trustee_person_node']['entity_deduplication_left'] = 0;
   $handler->display->display_options['relationships']['relation_trustee_person_node']['entity_deduplication_right'] = 0;
@@ -557,7 +578,7 @@ function kada_contact_information_feature_views_default_views() {
   $handler->display->display_options['relationships']['field_deputy_member_target_id']['table'] = 'field_data_field_deputy_member';
   $handler->display->display_options['relationships']['field_deputy_member_target_id']['field'] = 'field_deputy_member_target_id';
   $handler->display->display_options['relationships']['field_deputy_member_target_id']['ui_name'] = 'Deputy member';
-  $handler->display->display_options['relationships']['field_deputy_member_target_id']['label'] = 'Deputy member';
+  $handler->display->display_options['relationships']['field_deputy_member_target_id']['label'] = 'Varajäsen';
   /* Relationship: Role */
   $handler->display->display_options['relationships']['term_node_tid']['id'] = 'term_node_tid';
   $handler->display->display_options['relationships']['term_node_tid']['table'] = 'node';
@@ -578,7 +599,7 @@ function kada_contact_information_feature_views_default_views() {
     'theme' => 0,
     'trust_unit' => 0,
   );
-  /* Field: Content: Person image */
+  /* Kenttä: Sisältö: Person image */
   $handler->display->display_options['fields']['field_person_image']['id'] = 'field_person_image';
   $handler->display->display_options['fields']['field_person_image']['table'] = 'field_data_field_person_image';
   $handler->display->display_options['fields']['field_person_image']['field'] = 'field_person_image';
@@ -589,7 +610,7 @@ function kada_contact_information_feature_views_default_views() {
   $handler->display->display_options['fields']['field_person_image']['settings'] = array(
     'link' => '1',
   );
-  /* Field: Content: First name */
+  /* Kenttä: Sisältö: First name */
   $handler->display->display_options['fields']['field_first_name']['id'] = 'field_first_name';
   $handler->display->display_options['fields']['field_first_name']['table'] = 'field_data_field_first_name';
   $handler->display->display_options['fields']['field_first_name']['field'] = 'field_first_name';
@@ -603,7 +624,7 @@ function kada_contact_information_feature_views_default_views() {
     'title_link' => 'content',
     'title_class' => '',
   );
-  /* Field: Content: Surname */
+  /* Kenttä: Sisältö: Surname */
   $handler->display->display_options['fields']['field_surname']['id'] = 'field_surname';
   $handler->display->display_options['fields']['field_surname']['table'] = 'field_data_field_surname';
   $handler->display->display_options['fields']['field_surname']['field'] = 'field_surname';
@@ -621,7 +642,7 @@ function kada_contact_information_feature_views_default_views() {
     'title_link' => 'content',
     'title_class' => '',
   );
-  /* Field: Content: Role */
+  /* Kenttä: Sisältö: Role */
   $handler->display->display_options['fields']['field_trustee_role']['id'] = 'field_trustee_role';
   $handler->display->display_options['fields']['field_trustee_role']['table'] = 'field_data_field_trustee_role';
   $handler->display->display_options['fields']['field_trustee_role']['field'] = 'field_trustee_role';
@@ -633,12 +654,12 @@ function kada_contact_information_feature_views_default_views() {
   $handler->display->display_options['fields']['field_trustee_role']['settings'] = array(
     'link' => 0,
   );
-  /* Field: Content: Rendered Node */
+  /* Kenttä: Sisältö: Rendered Node */
   $handler->display->display_options['fields']['rendered_entity_1']['id'] = 'rendered_entity_1';
   $handler->display->display_options['fields']['rendered_entity_1']['table'] = 'views_entity_node';
   $handler->display->display_options['fields']['rendered_entity_1']['field'] = 'rendered_entity';
   $handler->display->display_options['fields']['rendered_entity_1']['relationship'] = 'field_deputy_member_target_id';
-  $handler->display->display_options['fields']['rendered_entity_1']['label'] = 'Deputy member';
+  $handler->display->display_options['fields']['rendered_entity_1']['label'] = 'Varajäsen';
   $handler->display->display_options['fields']['rendered_entity_1']['element_type'] = 'div';
   $handler->display->display_options['fields']['rendered_entity_1']['element_label_type'] = '0';
   $handler->display->display_options['fields']['rendered_entity_1']['element_label_colon'] = FALSE;
@@ -647,17 +668,17 @@ function kada_contact_information_feature_views_default_views() {
   $handler->display->display_options['fields']['rendered_entity_1']['link_to_entity'] = 1;
   $handler->display->display_options['fields']['rendered_entity_1']['view_mode'] = 'only_title';
   $handler->display->display_options['fields']['rendered_entity_1']['bypass_access'] = 0;
-  /* Sort criterion: Taxonomy term: Weight */
+  /* Sort criterion: Luokittelutermi: Paino */
   $handler->display->display_options['sorts']['weight']['id'] = 'weight';
   $handler->display->display_options['sorts']['weight']['table'] = 'taxonomy_term_data';
   $handler->display->display_options['sorts']['weight']['field'] = 'weight';
   $handler->display->display_options['sorts']['weight']['relationship'] = 'term_node_tid';
-  /* Sort criterion: Content: Surname (field_surname) */
+  /* Sort criterion: Sisältö: Surname (field_surname) */
   $handler->display->display_options['sorts']['field_surname_value']['id'] = 'field_surname_value';
   $handler->display->display_options['sorts']['field_surname_value']['table'] = 'field_data_field_surname';
   $handler->display->display_options['sorts']['field_surname_value']['field'] = 'field_surname_value';
   $handler->display->display_options['sorts']['field_surname_value']['relationship'] = 'relation_trustee_person_node';
-  /* Contextual filter: Content: Has taxonomy term ID (with depth) */
+  /* Contextual filter: Sisältö: Has taxonomy term ID (with depth) */
   $handler->display->display_options['arguments']['term_node_tid_depth']['id'] = 'term_node_tid_depth';
   $handler->display->display_options['arguments']['term_node_tid_depth']['table'] = 'node';
   $handler->display->display_options['arguments']['term_node_tid_depth']['field'] = 'term_node_tid_depth';
@@ -677,7 +698,7 @@ function kada_contact_information_feature_views_default_views() {
   );
   $handler->display->display_options['arguments']['term_node_tid_depth']['depth'] = '0';
   $handler->display->display_options['arguments']['term_node_tid_depth']['break_phrase'] = TRUE;
-  /* Contextual filter: Content: Has taxonomy term ID depth modifier */
+  /* Contextual filter: Sisältö: Has taxonomy term ID depth modifier */
   $handler->display->display_options['arguments']['term_node_tid_depth_modifier']['id'] = 'term_node_tid_depth_modifier';
   $handler->display->display_options['arguments']['term_node_tid_depth_modifier']['table'] = 'node';
   $handler->display->display_options['arguments']['term_node_tid_depth_modifier']['field'] = 'term_node_tid_depth_modifier';
@@ -686,13 +707,13 @@ function kada_contact_information_feature_views_default_views() {
   $handler->display->display_options['arguments']['term_node_tid_depth_modifier']['default_argument_type'] = 'fixed';
   $handler->display->display_options['arguments']['term_node_tid_depth_modifier']['summary']['format'] = 'default_summary';
   $handler->display->display_options['arguments']['term_node_tid_depth_modifier']['specify_validation'] = TRUE;
-  /* Filter criterion: Content: Published or admin */
+  /* Filter criterion: Sisältö: Published or admin */
   $handler->display->display_options['filters']['status_extra']['id'] = 'status_extra';
   $handler->display->display_options['filters']['status_extra']['table'] = 'node';
   $handler->display->display_options['filters']['status_extra']['field'] = 'status_extra';
   $handler->display->display_options['filters']['status_extra']['group'] = 0;
   $handler->display->display_options['filters']['status_extra']['expose']['operator'] = FALSE;
-  /* Filter criterion: Content: Type */
+  /* Filter criterion: Sisältö: Tyyppi */
   $handler->display->display_options['filters']['type']['id'] = 'type';
   $handler->display->display_options['filters']['type']['table'] = 'node';
   $handler->display->display_options['filters']['type']['field'] = 'type';
@@ -715,13 +736,13 @@ function kada_contact_information_feature_views_default_views() {
   $translatables['kada_trust_units'] = array(
     t('Master'),
     t('more'),
-    t('Apply'),
+    t('Hae'),
     t('Palauta oletusarvoihin'),
-    t('Sort by'),
-    t('Asc'),
-    t('Desc'),
-    t('Trustee person'),
-    t('Deputy member'),
+    t('Järjestele'),
+    t('Nou'),
+    t('Las'),
+    t('Luottamushenkilö'),
+    t('Varajäsen'),
     t('rooli'),
     t('[field_first_name] [field_surname]'),
     t('Kaikki'),