diff --git a/amadeus/static/css/themes/green.css b/amadeus/static/css/themes/green.css
index 7374fee..ff25d02 100644
--- a/amadeus/static/css/themes/green.css
+++ b/amadeus/static/css/themes/green.css
@@ -370,7 +370,7 @@ a.add-row {
 }
 
 .resource_list > .disabled a {
-    color: #777;
+    color: #BDBDBD;
 }
 
 .resource_list > .list-group-item:hover {
diff --git a/topics/models.py b/topics/models.py
index c59c0dd..1d29234 100644
--- a/topics/models.py
+++ b/topics/models.py
@@ -77,3 +77,19 @@ class Resource(KnowsChild):
 	@always_as_child
 	def access_link(self):
 		pass
+
+	"""
+		Method to get the appropriated update link
+		Must override in the child models
+	"""
+	@always_as_child
+	def update_link(self):
+		pass
+
+	"""
+		Method to get the appropriated delete link
+		Must override in the child models
+	"""
+	@always_as_child
+	def delete_link(self):
+		pass
\ No newline at end of file
diff --git a/topics/templates/resources/list.html b/topics/templates/resources/list.html
new file mode 100644
index 0000000..24bf3cd
--- /dev/null
+++ b/topics/templates/resources/list.html
@@ -0,0 +1,108 @@
+{% load static i18n pagination permissions_tags %}
+{% load django_bootstrap_breadcrumbs %}
+
+{% subject_permissions request.user topic.subject as has_subject_permissions %}
+
+<div id="resource_{{ topic.slug }}" class="list-group resource_list">
+	{% for resource in topic.resource_topic.all %}
+		{% if resource.visible or has_subject_permissions %}
+	  		<div class="list-group-item {% if not resource.visible %}disabled{% endif %}">
+	  			<input type="hidden" class="id_inp" name="id" value="{{ resource.id }}" />
+		    	<input type="hidden" class="order_inp" name="order" value="{{ resource.order }}" />
+		    	<input type="hidden" class="url_order" value="{% url 'topics:update_resource_order' %}" />
+
+	  			<h4 class="pull-left list-group-item-heading">
+	  				<a href="{% url resource.access_link resource.slug %}" class="resource_link" {% if resource.show_window %}target="_blank"{% endif %}>
+						{{ resource }}
+	  				</a>
+				</h4>
+
+				{% if has_subject_permissions %}
+					<div class="pull-right category-card-items">
+		                <a><i class="fa fa-arrows" aria-hidden="true"></i></a>
+		                <span class="btn-group pull-right">
+			                <button 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>
+			                </button>
+			                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="moreResources">
+			                    <li><a href="{% url resource.update_link 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 %}
+		        <br clear="all" />
+				{% autoescape off %}
+					{{ resource.brief_description }}
+				{% endautoescape %}
+	  		</div>
+	  	{% endif %}
+  	{% endfor %}
+</div>
+<script type="text/javascript">
+	function delete_resource(url) {
+	    $('.modal').remove();
+
+	    $.get(url, function (modal) {
+	        $("#resource_{{ topic.slug }}").parent().after(modal);
+
+	        $('.modal').modal('show');
+	    });
+	}
+
+	$(".list-group-item").unbind().on('click', function (e) {
+		var arrow = $(this).find('i.fa-arrows').is(e.target),
+			menu = $(this).find('i.fa-ellipsis-v').is(e.target),
+			btn = $(this).find('button.btn_menu').is(e.target),
+			del = $(this).find('a.delete').is(e.target),
+			upd = $(this).find('a.edit').is(e.target);
+		
+		if (!arrow && !menu && !del && !upd && !btn) {
+			var link = $(this).find('.resource_link').attr('href'),
+				target = $(this).find('.resource_link').attr('target');
+
+			if (typeof(target) != 'undefined') {
+				window.open(link, target);
+			} else {
+				window.location = link;
+			}
+		}
+	});
+
+	$("#resource_{{ topic.slug }}").sortable({ 
+	    delay: 100,
+	    distance: 5,
+	    handle: 'i.fa-arrows',
+	    update: function( event, ui ) {
+	  		var cont = 1;
+	  		var data = [];
+	  		
+	  		$("#resource_{{ topic.slug }}").find('.order_inp').each(function () {
+	  			$(this).val(cont++);
+
+	  			data.push({
+	  				'resource_id': $(this).parent().find('.id_inp').val(),
+	  				'resource_order': $(this).val()
+	  			});
+	  		});
+
+	  		data = JSON.stringify(data);
+
+	  		sendUpdateResource(data);
+	    },
+	});
+
+	function sendUpdateResource(data) {
+		$.ajax({
+			url: $("#resource_{{ topic.slug }}").find('.url_order').val(),
+			dataType: 'json',
+			data: {'data': data},
+			success: function(response) {
+				console.log(response);
+			},
+			error: function(response) {
+				console.log(response);	
+			}
+		});
+	}
+</script>
\ No newline at end of file
diff --git a/topics/templates/topics/list.html b/topics/templates/topics/list.html
index 0b5c5d0..e15d1ab 100644
--- a/topics/templates/topics/list.html
+++ b/topics/templates/topics/list.html
@@ -59,7 +59,7 @@
 						</div>
 					{% endif %}
 
-					{% include 'webpages/list.html' with topic=topic %}
+					{% include 'resources/list.html' with topic=topic %}
 			    </div>
 		    </div>
 		{% endif %}
diff --git a/webpage/models.py b/webpage/models.py
index 07aaccf..2234aeb 100644
--- a/webpage/models.py
+++ b/webpage/models.py
@@ -19,3 +19,9 @@ class Webpage(Resource):
 			return 'webpages:window_view'
 
 		return 'webpages:view'
+
+	def update_link(self):
+		return 'webpages:update'
+
+	def delete_link(self):
+		return 'webpages:delete'
diff --git a/webpage/templates/webpages/list.html b/webpage/templates/webpages/list.html
deleted file mode 100644
index c25c1ef..0000000
--- a/webpage/templates/webpages/list.html
+++ /dev/null
@@ -1,108 +0,0 @@
-{% load static i18n pagination permissions_tags %}
-{% load django_bootstrap_breadcrumbs %}
-
-{% subject_permissions request.user topic.subject as has_subject_permissions %}
-
-<div id="resource_{{ topic.slug }}" class="list-group resource_list">
-	{% for resource in topic.resource_topic.all %}
-		{% if resource.visible or has_subject_permissions %}
-	  		<div class="list-group-item {% if not resource.visible %}disabled{% endif %}">
-	  			<input type="hidden" class="id_inp" name="id" value="{{ resource.id }}" />
-		    	<input type="hidden" class="order_inp" name="order" value="{{ resource.order }}" />
-		    	<input type="hidden" class="url_order" value="{% url 'topics:update_resource_order' %}" />
-
-	  			<h4 class="pull-left list-group-item-heading">
-	  				<a href="{% url resource.access_link resource.slug %}" class="resource_link" {% if resource.show_window %}target="_blank"{% endif %}>
-						{{ resource }}
-	  				</a>
-				</h4>
-
-				{% if has_subject_permissions %}
-					<div class="pull-right category-card-items">
-		                <a><i class="fa fa-arrows" aria-hidden="true"></i></a>
-		                <span class="btn-group pull-right">
-			                <button 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>
-			                </button>
-			                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="moreResources">
-			                    <li><a href="{% url 'webpages:update' 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 'webpages:delete' resource.slug %}')" class="delete"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>{% trans 'Remove' %}</a></li>
-			                </ul>
-			            </span>
-		        	</div>
-		        {% endif %}
-		        <br clear="all" />
-				{% autoescape off %}
-					{{ resource.brief_description }}
-				{% endautoescape %}
-	  		</div>
-	  	{% endif %}
-  	{% endfor %}
-</div>
-<script type="text/javascript">
-	function delete_resource(url) {
-	    $('.modal').remove();
-
-	    $.get(url, function (modal) {
-	        $("#resource_{{ topic.slug }}").parent().after(modal);
-
-	        $('.modal').modal('show');
-	    });
-	}
-
-	$(".list-group-item").unbind().on('click', function (e) {
-		var arrow = $(this).find('i.fa-arrows').is(e.target),
-			menu = $(this).find('i.fa-ellipsis-v').is(e.target),
-			btn = $(this).find('button.btn_menu').is(e.target),
-			del = $(this).find('a.delete').is(e.target),
-			upd = $(this).find('a.edit').is(e.target);
-		
-		if (!arrow && !menu && !del && !upd && !btn) {
-			var link = $(this).find('.resource_link').attr('href'),
-				target = $(this).find('.resource_link').attr('target');
-
-			if (typeof(target) != 'undefined') {
-				window.open(link, target);
-			} else {
-				window.location = link;
-			}
-		}
-	});
-
-	$("#resource_{{ topic.slug }}").sortable({ 
-	    delay: 100,
-	    distance: 5,
-	    handle: 'i.fa-arrows',
-	    update: function( event, ui ) {
-	  		var cont = 1;
-	  		var data = [];
-	  		
-	  		$("#resource_{{ topic.slug }}").find('.order_inp').each(function () {
-	  			$(this).val(cont++);
-
-	  			data.push({
-	  				'resource_id': $(this).parent().find('.id_inp').val(),
-	  				'resource_order': $(this).val()
-	  			});
-	  		});
-
-	  		data = JSON.stringify(data);
-
-	  		sendUpdateResource(data);
-	    },
-	});
-
-	function sendUpdateResource(data) {
-		$.ajax({
-			url: $("#resource_{{ topic.slug }}").find('.url_order').val(),
-			dataType: 'json',
-			data: {'data': data},
-			success: function(response) {
-				console.log(response);
-			},
-			error: function(response) {
-				console.log(response);	
-			}
-		});
-	}
-</script>
\ No newline at end of file
--
libgit2 0.21.2