diff --git a/neologism.module b/neologism.module
index b47c0cd..cc234f7 100644
--- a/neologism.module
+++ b/neologism.module
@@ -85,8 +85,6 @@ function neologism_add_term($type, $vocabulary) {
  * This function corresponds to the auto loader wildcard component
  * of the kind %neologism_vocabulary in the /add-class and /add-property URLs
  *
- * @todo
- *   Remove notice popup
  */
 function neologism_vocabulary_load($nid) {
   if (!$nid) {
@@ -144,7 +142,46 @@ function neologism_view_index() {
   return $build;
 }
 
+/**
+ * Implements hook_node_view()
+ */
+function neologism_node_view($node, $view_mode) {
+
+  if ($node->type == 'workspace') {
+
+    $main_vocabulary_id = $node->workspace_main_vocabulary['und']['0']['nid'];
+
+    $class_query = new EntityFieldQuery();
+
+    // displaying main vocabulary classes
+    $class_entities = $class_query->entityCondition('entity_type', 'node')->entityCondition('bundle', 'class')->propertyCondition('status', 1)->fieldCondition('class_related_vocabulary', 'nid', $main_vocabulary_id, '=')->execute();
+
+    if (!empty($class_entities)) {
+
+      $nodes = node_load_multiple(array_keys($class_entities['node']));
+      $views = node_view_multiple($nodes, 'teaser');
+
+      $node->content['workspace_class_space'] = array();
+      $node->content['workspace_class_space'] = $views['nodes'];
+      $node->content['workspace_class_space']['#weight'] = 5;
+    }
+
+    $property_query = new EntityFieldQuery();
 
+    // displaying main vocabulary properties
+    $property_entities = $property_query->entityCondition('entity_type', 'node')->entityCondition('bundle', 'property')->propertyCondition('status', 1)->fieldCondition('property_related_vocabulary', 'nid', $main_vocabulary_id, '=')->execute();
+
+    if (!empty($property_entities)) {
+
+      $nodes = node_load_multiple(array_keys($property_entities['node']));
+      $views = node_view_multiple($nodes, 'teaser');
+
+      $node->content['workspace_property_space'] = array();
+      $node->content['workspace_property_space'] = $views['nodes'];
+      $node->content['workspace_property_space']['#weight'] = 10;
+    }
+  }
+}
 
 
 // Vocabulary Workspace .................
@@ -266,7 +303,6 @@ function neologism_form_vocabulary_node_form_alter(&$form, &$form_state, $form_i
 function neologism_form_class_node_form_alter(&$form, &$form_state, $form_id) {
 
   //  dd($form['#node']->vocabulary->title);
-
   $form['title']['#field_prefix'] = url('<front>', array('absolute' => TRUE)) . '<span id= "class-related-vocabulary-id-value">vocabulary-id</span>' . '#';
   $form['title']['#description'] = 'Class URI should include only letters, numbers, dashes, and underscores, and should start with an uppercase letter and use CamelCase capitalization.';
 
@@ -275,7 +311,6 @@ function neologism_form_class_node_form_alter(&$form, &$form_state, $form_id) {
 
   // set the display of the 'related vocabulary' field to hidden
   $form['class_related_vocabulary']['#access'] = FALSE;
-  //  $form['class_related_vocabulary']['und']['0']['nid']['#default_value'] = $form['#node']->vocabulary->title;
 }
 
 /**
@@ -303,6 +338,9 @@ function neologism_form_property_node_form_alter(&$form, &$form_state, $form_id)
 
   $form['#validate'] = array();
   $form['#validate'][] = '_neologism_form_property_node_form_validate_alter';
+
+  // set the display of the 'related vocabulary' field to hidden
+  $form['property_related_vocabulary']['#access'] = FALSE;
 }
 
 /**
@@ -310,11 +348,8 @@ function neologism_form_property_node_form_alter(&$form, &$form_state, $form_id)
  **/
 function _neologism_form_property_node_form_validate_alter(&$form, &$form_state) {
 
-  //Creating URL Alias
-  $related_vocabulary_id = $form_state['values']['property_related_vocabulary']['und']['0']['nid'];
-
-  $query = "SELECT {node}.title FROM {node} WHERE {node}.type = 'vocabulary' AND {node}.nid =" . $related_vocabulary_id . ";";
-  $table_attribute_value_array = db_query($query)->fetchCol();
-  $related_vocabulary = $table_attribute_value_array[0];
+  // fill the value of the hidden 'related vocabulary' field automatically
+  $form_state['input']['property_related_vocabulary']['und']['0']['nid'] = $form['#node']->vocabulary->nid;
+  $form_state['values']['property_related_vocabulary']['und']['0']['nid'] = $form['#node']->vocabulary->nid;
 }