diff --git a/links/forms.py b/links/forms.py
index 2349d25..9011530 100644
--- a/links/forms.py
+++ b/links/forms.py
@@ -29,14 +29,14 @@ class LinkForm(forms.ModelForm):
 	
 	class Meta:
 		model = Link
-		fields = ['name','link_url', 'brief_description', 'all_students', 'students', 'groups', 'visible']
+		fields = ['name','link_url', 'description_brief', 'all_students', 'students', 'groups', 'visible']
 		labels = {
 			'name': _('Link name'),
 			'end_view' : _('End View'),
 			'end_view_date': _('End View Date')
 		}
 		widgets = {
-			'brief_description': forms.Textarea,
+			'description_brief': forms.Textarea,
 			'students': forms.SelectMultiple,
 			'groups': forms.SelectMultiple,
 		}
diff --git a/links/migrations/0007_auto_20170201_1907.py b/links/migrations/0007_auto_20170201_1907.py
new file mode 100644
index 0000000..228ade6
--- /dev/null
+++ b/links/migrations/0007_auto_20170201_1907.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.4 on 2017-02-01 22:07
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('links', '0006_auto_20170201_1756'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='link',
+            old_name='description',
+            new_name='description_brief',
+        ),
+    ]
diff --git a/links/models.py b/links/models.py
index 8876e1d..38704f5 100644
--- a/links/models.py
+++ b/links/models.py
@@ -10,7 +10,7 @@ from django.utils import timezone
 class Link(Resource):
    
 
-    description = models.TextField(_("simpler_description"), blank=True)
+    description_brief = models.TextField(_("simpler_description"), blank=True)
 
     link_url = models.URLField(verbose_name = _("Link_URL"))
     
diff --git a/links/templates/links/_form.html b/links/templates/links/_form.html
index 6ee271d..c770abc 100644
--- a/links/templates/links/_form.html
+++ b/links/templates/links/_form.html
@@ -61,18 +61,18 @@
 
 
 	<div class="form-group{% if form.has_error %} has-error {% endif %} is-fileinput">
-		<label for="{{ form.brief_description.auto_id }}">{{ form.brief_description.label }}</label>
-		{% render_field form.brief_description class='form-control text_wysiwyg' %}
+		<label for="{{ form.description_brief.auto_id }}">{{ form.description_brief.label }}</label>
+		{% render_field form.description_brief class='form-control text_wysiwyg' %}
 
-		<span id="helpBlock" class="help-block">{{ form.brief_description.help_text }}</span>
+		<span id="helpBlock" class="help-block">{{ form.description_brief.help_text }}</span>
 			
-		{% if form.brief_description.errors %}
+		{% if form.description_brief.errors %}
 			<div class="alert alert-danger alert-dismissible" role="alert">
 					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
 						<span aria-hidden="true">&times;</span>
 					</button>
 				<ul>
-					{% for error in form.brief_description.errors %}
+					{% for error in form.description_brief.errors %}
 						<li>{{ error }}</li>
 					{% endfor %}
 				</ul>
diff --git a/subjects/templates/subjects/list_search.html b/subjects/templates/subjects/list_search.html
index 4ac99fb..078a346 100644
--- a/subjects/templates/subjects/list_search.html
+++ b/subjects/templates/subjects/list_search.html
@@ -35,11 +35,11 @@
     <div id="core-subjects-options-div">
         <ul class="core-subjects-options">
             {% if all %}
-                <a href="{% url 'subjects:search' %}?search= {{tags}} "><li >{% trans "Subjects" %} ({{ totals.my_subjects }})</li></a>
-                <a href="" ><li class="active">{% trans "Resources" %} ({{ totals.resources }})</li></a>
+                <a href="{% url 'subjects:search' 'subjects' %}?search={{tags}} "><li >{% trans "Subjects" %} ({{ totals.my_subjects }})</li></a>
+                <a href="{% url 'subjects:search' 'resources' %}?search={{tags}}" ><li class="active">{% trans "Resources" %} ({{ totals.resources }})</li></a>
             {% else %}
-                <a href="{% url 'subjects:search' %}?search={{tags}}"><li class="active">{% trans "Subjects" %} ({{ totals.my_subjects }})</li></a>
-                <a href="" ><li>{% trans "Resources" %} ({{ totals.resources }})</li></a>
+                <a href="{% url 'subjects:search' 'subjects' %}?search={{tags}}"><li class="active">{% trans "Subjects" %} ({{ totals.my_subjects }})</li></a>
+                <a href="{% url 'subjects:search' 'resources' %}?search={{tags}}" ><li>{% trans "Resources" %} ({{ totals.resources }})</li></a>
             {% endif %}
             
         </ul>
@@ -50,7 +50,7 @@
     <div class="col-md-12 cards-content">
 		
 
-		{% if subjects|length > 0 %}
+		{% if not all %}
 	    	<div class="panel-group" id="subject-accordion" role="tablist" aria-multiselectable="true">
 				{% for subject in subjects %}
 					{% include "subjects/subject_card.html" with accordion_id="subject-accordion" %}
@@ -58,9 +58,17 @@
 				
 				{% pagination request paginator page_obj %}
 			</div>
-		{% else %}
-			
+		 {% elif resources|length > 0 and all %}
+            <div class="panel-group" id="subject-accordion" role="tablist" aria-multiselectable="true">
+                {% for resource in resources %}
+                    {% include "subjects/resource_card.html" with resource=resource %}
+                {% endfor %}
+                
+                {% pagination request paginator page_obj %}
+            </div>
+        {% else %}	
 		{% endif %}
+
 	</div>
 
 	<div id="modal_course">
diff --git a/subjects/templates/subjects/resource_card.html b/subjects/templates/subjects/resource_card.html
new file mode 100644
index 0000000..fb3d64c
--- /dev/null
+++ b/subjects/templates/subjects/resource_card.html
@@ -0,0 +1,66 @@
+ {% load static i18n permissions_tags subject_counter %}
+
+ {% resource_permissions request.user resource as has_resource_permissions %}
+{% subject_permissions request.user resource.topic.subject as has_subject_permissions %}
+ {% if has_resource_permissions %}
+	<div class="panel panel-info subject-panel">
+        <div class="panel-heading">
+		
+	  		<div class="row">
+                <div class="col-md-12 category-header">
+                	<h4 class="panel-title">
+                   		<a class="category-course-link pull-left" data-parent="#{% if accordion_id %}{{ accordion_id }}{% else %}{{ subject.category.slug }}-accordion{% endif %}" data-toggle="collapse" href="#{{resource.slug}}">
+                            <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button> {{ resource }}
+                        </a>
+                	</h4>
+
+                    {% if has_subject_permissions %}
+					<div class="col-md-5 pull-right category-card-items">
+		                <span class="btn-group pull-right">
+			                <a class="btn btn-sm btn_menu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+			                	<i class="fa fa-ellipsis-v" aria-hidden="true"></i>
+			                </a>
+			                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="moreResources">
+			                    <li><a href="{% url resource.update_link resource.topic.slug resource.slug %}" class="edit"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li>
+			                    <li><a href="javascript:delete_resource('{% url resource.delete_link resource.slug %}')" class="delete"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>{% trans 'Remove' %}</a></li>
+			                </ul>
+			            </span>
+		        	</div>
+		   			{% endif %}
+                </div>
+            </div>
+
+           
+	  	</div>
+
+	  	 <div id="{{resource.slug}}" class="panel-collapse collapse category-panel-content">
+            <div class="row">
+                <div class="col-md-6">
+                    {% if resource.topic.subject.professor.all|length > 0  %}
+                        <h4><b>{% trans "Professor(s) " %}: </b>
+                            {{ resource.topic.subject.professor.all|join:', ' }}
+                        </h4>
+                    {% else %}
+                        <h4> {% trans "It doesn't possess professors" %} </h4>
+                    {% endif %}
+                </div>
+                <div class="col-xs-6 col-md-3">
+                    <p><b>{% trans "Category" %}: </b> {{resource.topic.subject.category.name}}</p>
+                </div>
+                <div class="col-xs-6 col-md-3">
+                    <p><b>{% trans "Subject" %}:</b> {{resource.topic.subject.name}}</p>
+                </div>
+            </div>
+            {% if resource.description %}
+                <p>{{resource.description|safe}}</p>
+            {% elif resource.description_brief %}
+            	<p>{{resource.description_brief|safe}}</p>
+            {% endif %}
+            
+             <a href="{% url resource.access_link resource.slug %}" class="btn btn-success btn-raised"> {% trans "Access Resource" %}</a>
+         
+        </div>
+	</div>
+
+
+{% endif %}
diff --git a/subjects/views.py b/subjects/views.py
index 043915a..7b74541 100644
--- a/subjects/views.py
+++ b/subjects/views.py
@@ -28,6 +28,7 @@ from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from .forms import CreateSubjectForm, UpdateSubjectForm
 from .utils import has_student_profile, has_professor_profile, count_subjects, get_category_page
 from users.models import User
+from topics.models import Resource
 
 
 class HomeView(LoginRequiredMixin, ListView):
@@ -602,14 +603,19 @@ class SubjectSearchView(LoginRequiredMixin, LogMixin, ListView):
         q = Q()
         for tag in tags:
             q = q | Q(tags__name__unaccent__icontains=tag  )
-       
+        
         subjects = Subject.objects.filter(q).distinct()
+       
+        self.resources = Resource.objects.filter(q).distinct()
         #pk = self.request.user.pk
         #my_subjects = Subject.objects.filter(Q(students__pk=pk) | Q(professor__pk=pk) | Q(category__coordinators__pk=pk) & Q(tags__name__in=tags) ).distinct()
         
-        self.totals = {'resources': subjects.count(), 'my_subjects': subjects.count()}
+        self.totals = {'resources': self.resources.count(), 'my_subjects': subjects.count()}
         #if self.kwargs.get('option'):
         #    subjects = my_subjects
+        option = self.kwargs.get('option')
+        if option and option == 'resources':
+            return self.resources
         return subjects
    
     def get_context_data(self, **kwargs):
@@ -621,10 +627,11 @@ class SubjectSearchView(LoginRequiredMixin, LogMixin, ListView):
 
         context['show_buttons'] = True #So it shows subscribe and access buttons
         context['totals'] = self.totals
-        
-        if self.kwargs.get('option'):
+        option = self.kwargs.get('option')
+        if option and option == 'resources':
             context['all'] = True
-            context['title'] = _('Subjects')
+            context['title'] = _('Resources')
+            context['resources'] = self.resources
 
         context['subjects_menu_active'] = ''
 
--
libgit2 0.21.2