diff --git a/fserver_ui/fserver_ui.pages_default.inc b/fserver_ui/fserver_ui.pages_default.inc
index 338b086..ca318b7 100644
--- a/fserver_ui/fserver_ui.pages_default.inc
+++ b/fserver_ui/fserver_ui.pages_default.inc
@@ -61,238 +61,249 @@ function fserver_ui_default_page_manager_handlers() {
   );
   $display->cache = array();
   $display->title = '%node:title';
+  $display->uuid = '780d391b-f590-4adc-af91-fef90bfb9813';
+  $display->storage_type = 'page_manager';
+  $display->storage_id = 'node_view_panel_context';
   $display->content = array();
   $display->panels = array();
-    $pane = new stdClass();
-    $pane->pid = 'new-1';
-    $pane->panel = 'left_above';
-    $pane->type = 'entity_field';
-    $pane->subtype = 'node:body';
-    $pane->shown = TRUE;
-    $pane->access = array();
-    $pane->configuration = array(
-      'label' => 'hidden',
-      'formatter' => 'text_default',
-      'delta_limit' => 0,
-      'delta_offset' => '0',
-      'delta_reversed' => FALSE,
-      'formatter_settings' => array(),
-      'context' => 'argument_entity_id:node_1',
-      'override_title' => 0,
-      'override_title_text' => '',
-    );
-    $pane->cache = array();
-    $pane->style = array(
-      'settings' => NULL,
-    );
-    $pane->css = array();
-    $pane->extras = array();
-    $pane->position = 0;
-    $pane->locks = array();
-    $display->content['new-1'] = $pane;
-    $display->panels['left_above'][0] = 'new-1';
-    $pane = new stdClass();
-    $pane->pid = 'new-2';
-    $pane->panel = 'middle';
-    $pane->type = 'node_links';
-    $pane->subtype = 'node_links';
-    $pane->shown = TRUE;
-    $pane->access = array();
-    $pane->configuration = array(
-      'override_title' => 0,
-      'override_title_text' => '',
-      'build_mode' => 'full',
-      'identifier' => '',
-      'link' => 0,
-      'context' => 'argument_entity_id:node_1',
-    );
-    $pane->cache = array();
-    $pane->style = array(
-      'settings' => NULL,
-    );
-    $pane->css = array();
-    $pane->extras = array();
-    $pane->position = 0;
-    $pane->locks = array();
-    $display->content['new-2'] = $pane;
-    $display->panels['middle'][0] = 'new-2';
-    $pane = new stdClass();
-    $pane->pid = 'new-3';
-    $pane->panel = 'middle';
-    $pane->type = 'views';
-    $pane->subtype = 'fserver_ui_releases';
-    $pane->shown = TRUE;
-    $pane->access = array();
-    $pane->configuration = array(
-      'override_pager_settings' => 0,
-      'use_pager' => 0,
-      'nodes_per_page' => '0',
-      'pager_id' => '0',
-      'offset' => '0',
-      'more_link' => 0,
-      'feed_icons' => 0,
-      'panel_args' => 0,
-      'link_to_view' => 0,
-      'args' => '',
-      'url' => '',
-      'display' => 'fserver_ui_block_releases',
-      'context' => array(
-        0 => 'argument_entity_id:node_1.nid',
-      ),
-      'override_title' => 0,
-      'override_title_text' => '',
-    );
-    $pane->cache = array();
-    $pane->style = array(
-      'settings' => NULL,
-    );
-    $pane->css = array();
-    $pane->extras = array();
-    $pane->position = 1;
-    $pane->locks = array();
-    $display->content['new-3'] = $pane;
-    $display->panels['middle'][1] = 'new-3';
-    $pane = new stdClass();
-    $pane->pid = 'new-4';
-    $pane->panel = 'right_above';
-    $pane->type = 'entity_field';
-    $pane->subtype = 'node:field_fserver_image';
-    $pane->shown = TRUE;
-    $pane->access = array();
-    $pane->configuration = array(
-      'label' => 'hidden',
-      'formatter' => 'image',
-      'delta_limit' => '0',
-      'delta_offset' => '0',
-      'delta_reversed' => 0,
-      'formatter_settings' => array(
-        'image_style' => 'medium',
-        'image_link' => '',
-      ),
-      'context' => 'argument_entity_id:node_1',
-      'override_title' => 0,
-      'override_title_text' => '',
-    );
-    $pane->cache = array();
-    $pane->style = array(
-      'settings' => NULL,
-    );
-    $pane->css = array();
-    $pane->extras = array();
-    $pane->position = 0;
-    $pane->locks = array();
-    $display->content['new-4'] = $pane;
-    $display->panels['right_above'][0] = 'new-4';
-    $pane = new stdClass();
-    $pane->pid = 'new-5';
-    $pane->panel = 'right_above';
-    $pane->type = 'node_updated';
-    $pane->subtype = 'node_updated';
-    $pane->shown = TRUE;
-    $pane->access = array();
-    $pane->configuration = array(
-      'format' => 'medium',
-      'context' => 'argument_entity_id:node_1',
-      'override_title' => 0,
-      'override_title_text' => '',
-    );
-    $pane->cache = array();
-    $pane->style = array(
-      'settings' => NULL,
-    );
-    $pane->css = array();
-    $pane->extras = array();
-    $pane->position = 1;
-    $pane->locks = array();
-    $display->content['new-5'] = $pane;
-    $display->panels['right_above'][1] = 'new-5';
-    $pane = new stdClass();
-    $pane->pid = 'new-6';
-    $pane->panel = 'right_above';
-    $pane->type = 'node_created';
-    $pane->subtype = 'node_created';
-    $pane->shown = TRUE;
-    $pane->access = array();
-    $pane->configuration = array(
-      'format' => 'medium',
-      'context' => 'argument_entity_id:node_1',
-      'override_title' => 0,
-      'override_title_text' => '',
-    );
-    $pane->cache = array();
-    $pane->style = array(
-      'settings' => NULL,
-    );
-    $pane->css = array();
-    $pane->extras = array();
-    $pane->position = 2;
-    $pane->locks = array();
-    $display->content['new-6'] = $pane;
-    $display->panels['right_above'][2] = 'new-6';
-    $pane = new stdClass();
-    $pane->pid = 'new-7';
-    $pane->panel = 'right_above';
-    $pane->type = 'entity_field';
-    $pane->subtype = 'node:field_fserver_demo';
-    $pane->shown = TRUE;
-    $pane->access = array();
-    $pane->configuration = array(
-      'label' => 'above',
-      'formatter' => 'url_default',
-      'delta_limit' => 0,
-      'delta_offset' => '0',
-      'delta_reversed' => FALSE,
-      'formatter_settings' => array(
-        'trim_length' => '80',
-        'nofollow' => 0,
-      ),
-      'context' => 'argument_entity_id:node_1',
-      'override_title' => 0,
-      'override_title_text' => '',
-    );
-    $pane->cache = array();
-    $pane->style = array(
-      'settings' => NULL,
-    );
-    $pane->css = array();
-    $pane->extras = array();
-    $pane->position = 3;
-    $pane->locks = array();
-    $display->content['new-7'] = $pane;
-    $display->panels['right_above'][3] = 'new-7';
-    $pane = new stdClass();
-    $pane->pid = 'new-8';
-    $pane->panel = 'right_above';
-    $pane->type = 'entity_field';
-    $pane->subtype = 'node:field_fserver_documentation';
-    $pane->shown = TRUE;
-    $pane->access = array();
-    $pane->configuration = array(
-      'label' => 'above',
-      'formatter' => 'url_default',
-      'delta_limit' => 0,
-      'delta_offset' => '0',
-      'delta_reversed' => FALSE,
-      'formatter_settings' => array(
-        'trim_length' => '80',
-        'nofollow' => 0,
-      ),
-      'context' => 'argument_entity_id:node_1',
-      'override_title' => 0,
-      'override_title_text' => '',
-    );
-    $pane->cache = array();
-    $pane->style = array(
-      'settings' => NULL,
-    );
-    $pane->css = array();
-    $pane->extras = array();
-    $pane->position = 4;
-    $pane->locks = array();
-    $display->content['new-8'] = $pane;
-    $display->panels['right_above'][4] = 'new-8';
+  $pane = new stdClass();
+  $pane->pid = 'new-b1e9c37f-b9c9-4b65-83ad-a3cfd07d1a78';
+  $pane->panel = 'left_above';
+  $pane->type = 'entity_field';
+  $pane->subtype = 'node:body';
+  $pane->shown = TRUE;
+  $pane->access = array();
+  $pane->configuration = array(
+    'label' => 'hidden',
+    'formatter' => 'text_default',
+    'delta_limit' => 0,
+    'delta_offset' => '0',
+    'delta_reversed' => FALSE,
+    'formatter_settings' => array(),
+    'context' => 'argument_entity_id:node_1',
+    'override_title' => 0,
+    'override_title_text' => '',
+  );
+  $pane->cache = array();
+  $pane->style = array(
+    'settings' => NULL,
+  );
+  $pane->css = array();
+  $pane->extras = array();
+  $pane->position = 0;
+  $pane->locks = array();
+  $pane->uuid = 'b1e9c37f-b9c9-4b65-83ad-a3cfd07d1a78';
+  $display->content['new-b1e9c37f-b9c9-4b65-83ad-a3cfd07d1a78'] = $pane;
+  $display->panels['left_above'][0] = 'new-b1e9c37f-b9c9-4b65-83ad-a3cfd07d1a78';
+  $pane = new stdClass();
+  $pane->pid = 'new-8ee429c8-d54b-4676-9dca-a4d373e586f1';
+  $pane->panel = 'middle';
+  $pane->type = 'node_links';
+  $pane->subtype = 'node_links';
+  $pane->shown = TRUE;
+  $pane->access = array();
+  $pane->configuration = array(
+    'override_title' => 0,
+    'override_title_text' => '',
+    'build_mode' => 'full',
+    'identifier' => '',
+    'link' => 0,
+    'context' => 'argument_entity_id:node_1',
+  );
+  $pane->cache = array();
+  $pane->style = array(
+    'settings' => NULL,
+  );
+  $pane->css = array();
+  $pane->extras = array();
+  $pane->position = 0;
+  $pane->locks = array();
+  $pane->uuid = '8ee429c8-d54b-4676-9dca-a4d373e586f1';
+  $display->content['new-8ee429c8-d54b-4676-9dca-a4d373e586f1'] = $pane;
+  $display->panels['middle'][0] = 'new-8ee429c8-d54b-4676-9dca-a4d373e586f1';
+  $pane = new stdClass();
+  $pane->pid = 'new-e81e8f20-8570-4e79-bdf0-9d8717d8b92f';
+  $pane->panel = 'middle';
+  $pane->type = 'views';
+  $pane->subtype = 'fserver_ui_releases';
+  $pane->shown = TRUE;
+  $pane->access = array();
+  $pane->configuration = array(
+    'override_pager_settings' => 0,
+    'use_pager' => 0,
+    'nodes_per_page' => '0',
+    'pager_id' => '0',
+    'offset' => '0',
+    'more_link' => 0,
+    'feed_icons' => 0,
+    'panel_args' => 0,
+    'link_to_view' => 0,
+    'args' => '',
+    'url' => '',
+    'display' => 'fserver_ui_block_releases',
+    'context' => array(
+      0 => 'argument_entity_id:node_1.nid',
+    ),
+    'override_title' => 0,
+    'override_title_text' => '',
+  );
+  $pane->cache = array();
+  $pane->style = array(
+    'settings' => NULL,
+  );
+  $pane->css = array();
+  $pane->extras = array();
+  $pane->position = 1;
+  $pane->locks = array();
+  $pane->uuid = 'e81e8f20-8570-4e79-bdf0-9d8717d8b92f';
+  $display->content['new-e81e8f20-8570-4e79-bdf0-9d8717d8b92f'] = $pane;
+  $display->panels['middle'][1] = 'new-e81e8f20-8570-4e79-bdf0-9d8717d8b92f';
+  $pane = new stdClass();
+  $pane->pid = 'new-9e3ed650-1549-4330-9533-db033cd27bde';
+  $pane->panel = 'right_above';
+  $pane->type = 'entity_field';
+  $pane->subtype = 'node:field_fserver_image';
+  $pane->shown = TRUE;
+  $pane->access = array();
+  $pane->configuration = array(
+    'label' => 'hidden',
+    'formatter' => 'image',
+    'delta_limit' => '0',
+    'delta_offset' => '0',
+    'delta_reversed' => 0,
+    'formatter_settings' => array(
+      'image_style' => 'medium',
+      'image_link' => '',
+    ),
+    'context' => 'argument_entity_id:node_1',
+    'override_title' => 0,
+    'override_title_text' => '',
+  );
+  $pane->cache = array();
+  $pane->style = array(
+    'settings' => NULL,
+  );
+  $pane->css = array();
+  $pane->extras = array();
+  $pane->position = 0;
+  $pane->locks = array();
+  $pane->uuid = '9e3ed650-1549-4330-9533-db033cd27bde';
+  $display->content['new-9e3ed650-1549-4330-9533-db033cd27bde'] = $pane;
+  $display->panels['right_above'][0] = 'new-9e3ed650-1549-4330-9533-db033cd27bde';
+  $pane = new stdClass();
+  $pane->pid = 'new-74979d26-832a-4579-b702-94285a69ff2b';
+  $pane->panel = 'right_above';
+  $pane->type = 'node_updated';
+  $pane->subtype = 'node_updated';
+  $pane->shown = TRUE;
+  $pane->access = array();
+  $pane->configuration = array(
+    'format' => 'medium',
+    'context' => 'argument_entity_id:node_1',
+    'override_title' => 0,
+    'override_title_text' => '',
+  );
+  $pane->cache = array();
+  $pane->style = array(
+    'settings' => NULL,
+  );
+  $pane->css = array();
+  $pane->extras = array();
+  $pane->position = 1;
+  $pane->locks = array();
+  $pane->uuid = '74979d26-832a-4579-b702-94285a69ff2b';
+  $display->content['new-74979d26-832a-4579-b702-94285a69ff2b'] = $pane;
+  $display->panels['right_above'][1] = 'new-74979d26-832a-4579-b702-94285a69ff2b';
+  $pane = new stdClass();
+  $pane->pid = 'new-dd587ed1-da6e-4d38-bd1a-7789c431760d';
+  $pane->panel = 'right_above';
+  $pane->type = 'node_created';
+  $pane->subtype = 'node_created';
+  $pane->shown = TRUE;
+  $pane->access = array();
+  $pane->configuration = array(
+    'format' => 'medium',
+    'context' => 'argument_entity_id:node_1',
+    'override_title' => 0,
+    'override_title_text' => '',
+  );
+  $pane->cache = array();
+  $pane->style = array(
+    'settings' => NULL,
+  );
+  $pane->css = array();
+  $pane->extras = array();
+  $pane->position = 2;
+  $pane->locks = array();
+  $pane->uuid = 'dd587ed1-da6e-4d38-bd1a-7789c431760d';
+  $display->content['new-dd587ed1-da6e-4d38-bd1a-7789c431760d'] = $pane;
+  $display->panels['right_above'][2] = 'new-dd587ed1-da6e-4d38-bd1a-7789c431760d';
+  $pane = new stdClass();
+  $pane->pid = 'new-9697c204-6996-4ceb-868e-db159b0a227c';
+  $pane->panel = 'right_above';
+  $pane->type = 'entity_field';
+  $pane->subtype = 'node:field_fserver_demo';
+  $pane->shown = TRUE;
+  $pane->access = array();
+  $pane->configuration = array(
+    'label' => 'above',
+    'formatter' => 'url_default',
+    'delta_limit' => 0,
+    'delta_offset' => '0',
+    'delta_reversed' => FALSE,
+    'formatter_settings' => array(
+      'trim_length' => '80',
+      'nofollow' => 0,
+    ),
+    'context' => 'argument_entity_id:node_1',
+    'override_title' => 0,
+    'override_title_text' => '',
+  );
+  $pane->cache = array();
+  $pane->style = array(
+    'settings' => NULL,
+  );
+  $pane->css = array();
+  $pane->extras = array();
+  $pane->position = 3;
+  $pane->locks = array();
+  $pane->uuid = '9697c204-6996-4ceb-868e-db159b0a227c';
+  $display->content['new-9697c204-6996-4ceb-868e-db159b0a227c'] = $pane;
+  $display->panels['right_above'][3] = 'new-9697c204-6996-4ceb-868e-db159b0a227c';
+  $pane = new stdClass();
+  $pane->pid = 'new-dbe74f10-4dfc-413d-8204-50b8cd0c767a';
+  $pane->panel = 'right_above';
+  $pane->type = 'entity_field';
+  $pane->subtype = 'node:field_fserver_documentation';
+  $pane->shown = TRUE;
+  $pane->access = array();
+  $pane->configuration = array(
+    'label' => 'above',
+    'formatter' => 'url_default',
+    'delta_limit' => 0,
+    'delta_offset' => '0',
+    'delta_reversed' => FALSE,
+    'formatter_settings' => array(
+      'trim_length' => '80',
+      'nofollow' => 0,
+    ),
+    'context' => 'argument_entity_id:node_1',
+    'override_title' => 0,
+    'override_title_text' => '',
+  );
+  $pane->cache = array();
+  $pane->style = array(
+    'settings' => NULL,
+  );
+  $pane->css = array();
+  $pane->extras = array();
+  $pane->position = 4;
+  $pane->locks = array();
+  $pane->uuid = 'dbe74f10-4dfc-413d-8204-50b8cd0c767a';
+  $display->content['new-dbe74f10-4dfc-413d-8204-50b8cd0c767a'] = $pane;
+  $display->panels['right_above'][4] = 'new-dbe74f10-4dfc-413d-8204-50b8cd0c767a';
   $display->hide_title = PANELS_TITLE_FIXED;
-  $display->title_pane = 'new-1';
+  $display->title_pane = 'new-b1e9c37f-b9c9-4b65-83ad-a3cfd07d1a78';
   $handler->conf['display'] = $display;
   $export['node_view_panel_context'] = $handler;
 
diff --git a/fserver_ui/fserver_ui.views_default.inc b/fserver_ui/fserver_ui.views_default.inc
index b20a468..7c9f75d 100644
--- a/fserver_ui/fserver_ui.views_default.inc
+++ b/fserver_ui/fserver_ui.views_default.inc
@@ -14,7 +14,7 @@ function fserver_ui_views_default_views() {
   $view->name = 'fserver_ui_projects';
   $view->description = 'List of projects';
   $view->tag = 'Fserver UI';
-  $view->base_table = 'project';
+  $view->base_table = 'fserver_project';
   $view->human_name = 'Projects';
   $view->core = 7;
   $view->api_version = '3.0';
@@ -39,7 +39,6 @@ function fserver_ui_views_default_views() {
     'title' => 'title',
     'type' => 'type',
     'project_status' => 'project_status',
-    'view_link' => 'view_link',
   );
   $handler->display->display_options['style_options']['default'] = '-1';
   $handler->display->display_options['style_options']['info'] = array(
@@ -64,11 +63,6 @@ function fserver_ui_views_default_views() {
       'separator' => '',
       'empty_column' => 0,
     ),
-    'view_link' => array(
-      'align' => '',
-      'separator' => '',
-      'empty_column' => 0,
-    ),
   );
   $handler->display->display_options['style_options']['sticky'] = TRUE;
   $handler->display->display_options['style_options']['summary'] = 'List of projects available through Feature Server';
@@ -89,60 +83,56 @@ function fserver_ui_views_default_views() {
   $handler->display->display_options['empty']['area_text_custom']['field'] = 'area_text_custom';
   $handler->display->display_options['empty']['area_text_custom']['empty'] = TRUE;
   $handler->display->display_options['empty']['area_text_custom']['content'] = 'No projects available.';
-  /* Field: Project: Title */
+  /* Relationship: Entity Reference: Referencing entity */
+  $handler->display->display_options['relationships']['reverse_field_project_reference_node']['id'] = 'reverse_field_project_reference_node';
+  $handler->display->display_options['relationships']['reverse_field_project_reference_node']['table'] = 'fserver_project';
+  $handler->display->display_options['relationships']['reverse_field_project_reference_node']['field'] = 'reverse_field_project_reference_node';
+  $handler->display->display_options['relationships']['reverse_field_project_reference_node']['required'] = TRUE;
+  /* Field: Content: Nid */
+  $handler->display->display_options['fields']['nid']['id'] = 'nid';
+  $handler->display->display_options['fields']['nid']['table'] = 'node';
+  $handler->display->display_options['fields']['nid']['field'] = 'nid';
+  $handler->display->display_options['fields']['nid']['relationship'] = 'reverse_field_project_reference_node';
+  $handler->display->display_options['fields']['nid']['label'] = '';
+  $handler->display->display_options['fields']['nid']['exclude'] = TRUE;
+  $handler->display->display_options['fields']['nid']['element_label_colon'] = FALSE;
+  /* Field: Project: Label */
   $handler->display->display_options['fields']['title']['id'] = 'title';
-  $handler->display->display_options['fields']['title']['table'] = 'project';
+  $handler->display->display_options['fields']['title']['table'] = 'fserver_project';
   $handler->display->display_options['fields']['title']['field'] = 'title';
   $handler->display->display_options['fields']['title']['label'] = 'Name';
   $handler->display->display_options['fields']['title']['alter']['make_link'] = TRUE;
-  $handler->display->display_options['fields']['title']['alter']['path'] = '[path]';
+  $handler->display->display_options['fields']['title']['alter']['path'] = 'node/[nid]';
   $handler->display->display_options['fields']['title']['alter']['absolute'] = TRUE;
   $handler->display->display_options['fields']['title']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['title']['element_default_classes'] = FALSE;
-  /* Field: Project: project type */
+  /* Field: Project: Type */
   $handler->display->display_options['fields']['type']['id'] = 'type';
-  $handler->display->display_options['fields']['type']['table'] = 'project';
+  $handler->display->display_options['fields']['type']['table'] = 'fserver_project';
   $handler->display->display_options['fields']['type']['field'] = 'type';
-  $handler->display->display_options['fields']['type']['label'] = 'Type';
   /* Field: Project: Compatibility */
   $handler->display->display_options['fields']['field_compatibility']['id'] = 'field_compatibility';
   $handler->display->display_options['fields']['field_compatibility']['table'] = 'field_data_field_compatibility';
   $handler->display->display_options['fields']['field_compatibility']['field'] = 'field_compatibility';
   $handler->display->display_options['fields']['field_compatibility']['delta_offset'] = '0';
-  /* Field: Project: Project Status */
+  /* Field: Project: Project_status */
   $handler->display->display_options['fields']['project_status']['id'] = 'project_status';
-  $handler->display->display_options['fields']['project_status']['table'] = 'project';
+  $handler->display->display_options['fields']['project_status']['table'] = 'fserver_project';
   $handler->display->display_options['fields']['project_status']['field'] = 'project_status';
   $handler->display->display_options['fields']['project_status']['label'] = 'Status';
   /* Field: Project: Link */
-  $handler->display->display_options['fields']['view_link']['id'] = 'view_link';
-  $handler->display->display_options['fields']['view_link']['table'] = 'project';
-  $handler->display->display_options['fields']['view_link']['field'] = 'view_link';
-  $handler->display->display_options['fields']['view_link']['label'] = '';
-  $handler->display->display_options['fields']['view_link']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['view_link']['text'] = 'more';
-  /* Field: Content: Screenshots */
-  $handler->display->display_options['fields']['field_fserver_image']['id'] = 'field_fserver_image';
-  $handler->display->display_options['fields']['field_fserver_image']['table'] = 'field_data_field_fserver_image';
-  $handler->display->display_options['fields']['field_fserver_image']['field'] = 'field_fserver_image';
-  $handler->display->display_options['fields']['field_fserver_image']['relationship'] = 'reverse_field_project_reference_node';
-  $handler->display->display_options['fields']['field_fserver_image']['label'] = '';
-  $handler->display->display_options['fields']['field_fserver_image']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['field_fserver_image']['click_sort_column'] = 'fid';
-  $handler->display->display_options['fields']['field_fserver_image']['settings'] = array(
-    'image_style' => 'thumbnail',
-    'image_link' => 'content',
-  );
-  $handler->display->display_options['fields']['field_fserver_image']['delta_offset'] = '0';
-  /* Sort criterion: Project: Name */
+  $handler->display->display_options['fields']['link']['id'] = 'link';
+  $handler->display->display_options['fields']['link']['table'] = 'fserver_project';
+  $handler->display->display_options['fields']['link']['field'] = 'link';
+  /* Sort criterion: Project: Short_name */
   $handler->display->display_options['sorts']['short_name']['id'] = 'short_name';
-  $handler->display->display_options['sorts']['short_name']['table'] = 'project';
+  $handler->display->display_options['sorts']['short_name']['table'] = 'fserver_project';
   $handler->display->display_options['sorts']['short_name']['field'] = 'short_name';
   $handler->display->display_options['sorts']['short_name']['exposed'] = TRUE;
   $handler->display->display_options['sorts']['short_name']['expose']['label'] = 'Name';
-  /* Sort criterion: Project: project type */
+  /* Sort criterion: Project: Type */
   $handler->display->display_options['sorts']['type']['id'] = 'type';
-  $handler->display->display_options['sorts']['type']['table'] = 'project';
+  $handler->display->display_options['sorts']['type']['table'] = 'fserver_project';
   $handler->display->display_options['sorts']['type']['field'] = 'type';
   $handler->display->display_options['sorts']['type']['exposed'] = TRUE;
   $handler->display->display_options['sorts']['type']['expose']['label'] = 'Type';
@@ -168,7 +158,7 @@ function fserver_ui_views_default_views() {
   );
   /* Filter criterion: Project type */
   $handler->display->display_options['filters']['type']['id'] = 'type';
-  $handler->display->display_options['filters']['type']['table'] = 'project';
+  $handler->display->display_options['filters']['type']['table'] = 'fserver_project';
   $handler->display->display_options['filters']['type']['field'] = 'type';
   $handler->display->display_options['filters']['type']['ui_name'] = 'Project type';
   $handler->display->display_options['filters']['type']['group'] = 1;
@@ -195,13 +185,6 @@ function fserver_ui_views_default_views() {
     2 => '2',
     1 => 0,
   );
-  /* Filter criterion: Content: Nid */
-  $handler->display->display_options['filters']['nid']['id'] = 'nid';
-  $handler->display->display_options['filters']['nid']['table'] = 'node';
-  $handler->display->display_options['filters']['nid']['field'] = 'nid';
-  $handler->display->display_options['filters']['nid']['relationship'] = 'reverse_field_project_reference_node';
-  $handler->display->display_options['filters']['nid']['operator'] = 'not empty';
-  $handler->display->display_options['filters']['nid']['group'] = 1;
 
   /* Display: Projects Page */
   $handler = $view->new_display('page', 'Projects Page', 'fserver_ui_projects');
@@ -222,42 +205,13 @@ function fserver_ui_views_default_views() {
   $handler->display->display_options['pager']['options']['items_per_page'] = '5';
   $handler->display->display_options['pager']['options']['offset'] = '0';
   $handler->display->display_options['pager']['options']['id'] = '0';
-  $translatables['fserver_ui_projects'] = array(
-    t('Master'),
-    t('Projects'),
-    t('more'),
-    t('Filter'),
-    t('Reset'),
-    t('Sort by'),
-    t('Asc'),
-    t('Desc'),
-    t('Items per page'),
-    t('- All -'),
-    t('Offset'),
-    t('« first'),
-    t('‹ previous'),
-    t('next ›'),
-    t('last »'),
-    t('Create Project'),
-    t('No projects available.'),
-    t('Content referencing Project from field_project_reference'),
-    t('Name'),
-    t('Description'),
-    t('Type'),
-    t('Compatibility'),
-    t('Status'),
-    t('Text Filter'),
-    t('Projects Page'),
-    t('Projects Block'),
-    t('List projects in a block'),
-  );
   $export['fserver_ui_projects'] = $view;
 
   $view = new view();
   $view->name = 'fserver_ui_releases';
   $view->description = 'List of releases for a given project.';
   $view->tag = 'Fserver UI';
-  $view->base_table = 'release';
+  $view->base_table = 'fserver_release';
   $view->human_name = 'Releases';
   $view->core = 7;
   $view->api_version = '3.0';
@@ -316,7 +270,7 @@ function fserver_ui_views_default_views() {
   $handler->display->display_options['empty']['area_text_custom']['content'] = 'No releases available.';
   /* Field: Release: Version */
   $handler->display->display_options['fields']['version']['id'] = 'version';
-  $handler->display->display_options['fields']['version']['table'] = 'release';
+  $handler->display->display_options['fields']['version']['table'] = 'fserver_release';
   $handler->display->display_options['fields']['version']['field'] = 'version';
   $handler->display->display_options['fields']['version']['element_label_colon'] = FALSE;
   /* Field: Release: File */
@@ -331,59 +285,15 @@ function fserver_ui_views_default_views() {
   $handler->display->display_options['fields']['field_release_files']['separator'] = ' |  ';
   /* Field: Release: Date */
   $handler->display->display_options['fields']['date']['id'] = 'date';
-  $handler->display->display_options['fields']['date']['table'] = 'release';
+  $handler->display->display_options['fields']['date']['table'] = 'fserver_release';
   $handler->display->display_options['fields']['date']['field'] = 'date';
   $handler->display->display_options['fields']['date']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['date']['date_format'] = 'custom';
   $handler->display->display_options['fields']['date']['custom_date_format'] = 'Y-M-d';
-  /* Field: Release: Link */
-  $handler->display->display_options['fields']['view_link']['id'] = 'view_link';
-  $handler->display->display_options['fields']['view_link']['table'] = 'release';
-  $handler->display->display_options['fields']['view_link']['field'] = 'view_link';
-  $handler->display->display_options['fields']['view_link']['label'] = 'Links';
-  $handler->display->display_options['fields']['view_link']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['view_link']['text'] = 'Notes';
-  /* Contextual filter: Content: 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';
-  $handler->display->display_options['arguments']['nid']['relationship'] = 'reverse_field_project_reference_node';
-  $handler->display->display_options['arguments']['nid']['default_action'] = 'default';
-  $handler->display->display_options['arguments']['nid']['default_argument_type'] = 'node';
-  $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';
-  $handler->display->display_options['arguments']['nid']['specify_validation'] = TRUE;
-  $handler->display->display_options['arguments']['nid']['validate']['type'] = 'node';
-  $handler->display->display_options['arguments']['nid']['validate_options']['types'] = array(
-    'fserver_project_page' => 'fserver_project_page',
-  );
-  $handler->display->display_options['arguments']['nid']['validate_options']['access'] = TRUE;
 
   /* Display: Releases Bock */
   $handler = $view->new_display('block', 'Releases Bock', 'fserver_ui_block_releases');
   $handler->display->display_options['display_description'] = 'List of releases for a given project';
-  $translatables['fserver_ui_releases'] = array(
-    t('Master'),
-    t('Releases'),
-    t('more'),
-    t('Apply'),
-    t('Reset'),
-    t('Sort by'),
-    t('Asc'),
-    t('Desc'),
-    t('No releases available.'),
-    t('project'),
-    t('Content referencing Project from field_project_reference'),
-    t('Version'),
-    t('Downloads'),
-    t('Date'),
-    t('Links'),
-    t('Notes'),
-    t('All'),
-    t('Releases Bock'),
-    t('List of releases for a given project'),
-  );
   $export['fserver_ui_releases'] = $view;
 
   return $export;