diff --git a/erpnext/config/education.py b/erpnext/config/education.py
index ba6aa88..96f660a 100644
--- a/erpnext/config/education.py
+++ b/erpnext/config/education.py
@@ -193,15 +193,15 @@
 				},
 				{
 					"type": "doctype",
-					"name": "Content"
+					"name": "Article"
 				},
 				{
 					"type": "doctype",
-					"name": "Question"
+					"name": "Video"
 				},
 				{
 					"type": "doctype",
-					"name": "Instructor"
+					"name": "Quiz"
 				},
 				{
 					"type": "doctype",
diff --git a/erpnext/education/doctype/question/question.json b/erpnext/education/doctype/question/question.json
index c62d4a9..cca89cf 100644
--- a/erpnext/education/doctype/question/question.json
+++ b/erpnext/education/doctype/question/question.json
@@ -16,20 +16,20 @@
  "fields": [
   {
    "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 1, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
    "fieldname": "question", 
-   "fieldtype": "Text", 
+   "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_global_search": 0, 
    "in_list_view": 1, 
-   "in_standard_filter": 1, 
+   "in_standard_filter": 0, 
    "label": "Question", 
    "length": 0, 
    "no_copy": 0, 
@@ -91,7 +91,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-10-17 12:08:05.649254", 
+ "modified": "2018-10-18 15:31:28.471650", 
  "modified_by": "Administrator", 
  "module": "Education", 
  "name": "Question", 
diff --git a/erpnext/education/doctype/quiz_question/quiz_question.json b/erpnext/education/doctype/quiz_question/quiz_question.json
index 8cdb3e4..3857c5c 100644
--- a/erpnext/education/doctype/quiz_question/quiz_question.json
+++ b/erpnext/education/doctype/quiz_question/quiz_question.json
@@ -45,6 +45,40 @@
    "set_only_once": 0, 
    "translatable": 0, 
    "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "question_link.question", 
+   "fieldname": "question", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Question", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
   }
  ], 
  "has_web_view": 0, 
@@ -57,7 +91,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2018-10-17 06:13:00.098883", 
+ "modified": "2018-10-18 15:35:12.195250", 
  "modified_by": "Administrator", 
  "module": "Education", 
  "name": "Quiz Question",