diff --git a/helpdesk/templates/helpdesk/faq/faq_list_view.html b/helpdesk/templates/helpdesk/faq/faq_list_view.html
index 06d4e3062..dbd08a5df 100644
--- a/helpdesk/templates/helpdesk/faq/faq_list_view.html
+++ b/helpdesk/templates/helpdesk/faq/faq_list_view.html
@@ -1,75 +1,82 @@
{% extends 'index.html' %} {% block content %} {% load static %} {% load i18n %}
+ {% include 'helpdesk/faq/faq_nav.html'%}
+
+
{% include "helpdesk/faq/faq_list.html" %}
+
- {% include 'helpdesk/faq/faq_nav.html'%}
-
- {% if faqs %}
-
- {% include "helpdesk/faq/faq_list.html" %}
-
- {% endif %}
-
+
-
+
-
-
-
+
{% endblock %}
diff --git a/helpdesk/templates/helpdesk/faq/faq_view.html b/helpdesk/templates/helpdesk/faq/faq_view.html
index f185132af..69c12acea 100644
--- a/helpdesk/templates/helpdesk/faq/faq_view.html
+++ b/helpdesk/templates/helpdesk/faq/faq_view.html
@@ -4,7 +4,20 @@
{% include 'helpdesk/faq/faq_category_nav.html'%}
- {% include "helpdesk/faq/faq_category_list.html" %}
+ {% if faq_categories %}
+ {% include "helpdesk/faq/faq_category_list.html" %}
+ {% else %}
+
+

+
+ {% trans "There are no FAQs at the moment." %}
+
+
+ {% endif %}
diff --git a/helpdesk/templates/helpdesk/faq/load_faq.html b/helpdesk/templates/helpdesk/faq/load_faq.html
new file mode 100644
index 000000000..b9b3793a1
--- /dev/null
+++ b/helpdesk/templates/helpdesk/faq/load_faq.html
@@ -0,0 +1,111 @@
+{% load static i18n %}
+
+
+
\ No newline at end of file
diff --git a/helpdesk/templates/helpdesk/ticket/ticket_individual_view.html b/helpdesk/templates/helpdesk/ticket/ticket_individual_view.html
index 78bf2cbb6..9cd033113 100644
--- a/helpdesk/templates/helpdesk/ticket/ticket_individual_view.html
+++ b/helpdesk/templates/helpdesk/ticket/ticket_individual_view.html
@@ -115,7 +115,7 @@