diff --git a/amadeus/static/css/themes/green.css b/amadeus/static/css/themes/green.css
index 5c522a3..4cd0fe7 100644
--- a/amadeus/static/css/themes/green.css
+++ b/amadeus/static/css/themes/green.css
@@ -455,6 +455,11 @@ a.add-row {
     background-color: initial !important;
 }
 
+.popover {
+    background: #FFF;
+    color: #333;
+}
+
 @media(max-width: 768px) {
     .navbar .navbar-nav .dropdown .dropdown-menu li > a {
         color: #333333 !important;
diff --git a/categories/migrations/0009_auto_20170130_1828.py b/categories/migrations/0009_auto_20170130_1828.py
new file mode 100644
index 0000000..acc09e3
--- /dev/null
+++ b/categories/migrations/0009_auto_20170130_1828.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2017-01-30 21:28
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('categories', '0008_auto_20170126_1953'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='category',
+            name='coordinators',
+            field=models.ManyToManyField(blank=True, related_name='Coordenadores', to=settings.AUTH_USER_MODEL),
+        ),
+    ]
diff --git a/links/migrations/0001_initial.py b/links/migrations/0001_initial.py
new file mode 100644
index 0000000..8d18c52
--- /dev/null
+++ b/links/migrations/0001_initial.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2017-01-30 21:28
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('topics', '0007_auto_20170123_1911'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Link',
+            fields=[
+                ('resource_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='topics.Resource')),
+                ('description', models.TextField(blank=True, verbose_name='simpler_description')),
+                ('link_url', models.URLField(verbose_name='Link_URL')),
+                ('initial_view', models.BooleanField(default=False, verbose_name='Initial View')),
+                ('initial_view_date', models.DateField(default=django.utils.timezone.now, verbose_name='Initial View Date')),
+                ('end_view', models.BooleanField(default=False, verbose_name='Initial View')),
+                ('end_view_date', models.DateField(default=django.utils.timezone.now, verbose_name='Initial View Date')),
+            ],
+            options={
+                'verbose_name_plural': 'Links',
+                'verbose_name': 'Link',
+            },
+            bases=('topics.resource',),
+        ),
+    ]
diff --git a/notifications/migrations/0002_auto_20170130_1828.py b/notifications/migrations/0002_auto_20170130_1828.py
new file mode 100644
index 0000000..b0e16f2
--- /dev/null
+++ b/notifications/migrations/0002_auto_20170130_1828.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2017-01-30 21:28
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('notifications', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='notification',
+            name='meta',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Meta'),
+        ),
+    ]
diff --git a/notifications/models.py b/notifications/models.py
index 8494e04..b466daf 100644
--- a/notifications/models.py
+++ b/notifications/models.py
@@ -5,7 +5,7 @@ from users.models import User
 from pendencies.models import Pendencies
 
 class Notification(models.Model):
-	meta = models.DateField(_('Meta'), null = True, blank = True)
+	meta = models.DateTimeField(_('Meta'), null = True, blank = True)
 	task = models.ForeignKey(Pendencies, verbose_name = _('Task'), related_name = 'notification_pendencies')
 	user = models.ForeignKey(User, verbose_name = _('User'), related_name = 'notification_user')
 	level = models.IntegerField(_('Type'), choices = ((1, _('Type 1-A')), (2, _('Type 1-B')), (3, _('Type 2')), (4, _('Type 3'))))
diff --git a/notifications/templates/notifications/_history.html b/notifications/templates/notifications/_history.html
index e178525..63fd604 100644
--- a/notifications/templates/notifications/_history.html
+++ b/notifications/templates/notifications/_history.html
@@ -62,6 +62,9 @@
 						</tr>
 					{% endfor %}
 				{% else %}
+					<tr>
+						<td colspan="6" class="text-center">{% trans 'No results found' %}</td>
+					</tr>
 				{% endif %}
 			</tbody>
 		</table>
diff --git a/notifications/templates/notifications/_view.html b/notifications/templates/notifications/_view.html
index a98d970..8533d89 100644
--- a/notifications/templates/notifications/_view.html
+++ b/notifications/templates/notifications/_view.html
@@ -42,7 +42,7 @@
 					</div>
 				</div>
 				<div class="row text-center">
-					<a href="" class="btn btn-success btn-raised">
+					<a href="{% url notification.task.resource.access_link notification.task.resource.slug %}" class="btn btn-success btn-raised" {% if notification.task.resource.show_window %}target="_blank"{% endif %}>
 						{% if notification.level == 4 %}
 							{% trans 'Access the task' %}
 						{% else %}
@@ -52,16 +52,83 @@
 
 					{% if notification.level < 3 %}
 						<button class="btn btn-default no_button">{% trans 'or' %}</button>
-						<a href="" class="btn btn-default btn-raised">
+						<button class="btn btn-default btn-raised" data-toggle="popover" data-trigger="focus" data-placement="right">
 							{% if notification.level == 1 %}
 								{% trans 'Define goal to realization' %}
 							{% else %}
 								{% trans 'Define new goal' %}
 							{% endif %}
-						</a>
+						</button>
+
+						<div class="popover">
+              				<div class="popover-content">
+								<form role="form" method="post">
+									{% csrf_token %}
+	  								<div style="overflow:hidden;">
+									    <div class="form-group">
+									        <div class="row">
+									            <div class="col-md-12">
+									                <div class="datetimepicker"></div>
+									                <input type="hidden" class="meta" name="meta" />
+									                <input type="hidden" name="id" value="{{ notification.id }}">
+									            </div>
+									        </div>
+									    </div>
+									</div>
+								</form>
+              				</div>
+              				<div class="popover-footer">
+              					<button type="button" class="btn btn-raised btn-sm btn-primary save pull-left">
+              						{% trans 'Save Goal' %}
+          						</button>
+              					<button type="button" class="btn btn-default btn-sm btn-raised cancel pull-right">
+              						{% trans 'Cancel' %}
+          						</button>
+      						</div>
+  						</div>
 					{% endif %}
 				</div>
 			</div>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
+<script>
+$(document).ready(function(){
+	var locale = navigator.language || navigator.userLanguage;
+
+    $('[data-toggle="popover"]').popover({
+    	html: true,
+        content: function () {
+            return $(".popover").html();
+        }
+	}).on('shown.bs.popover', function (e) {
+		if($(this).is(e.target)){
+			var popover = $(this),
+				datetime = popover.parent().find('.datetimepicker'),
+				form = popover.parent().find('form'),
+				cancel = popover.parent().find('.cancel'),
+				save = popover.parent().find('.save');
+
+			if (typeof(datetime.data("DateTimePicker")) != "undefined") {
+				datetime.data("DateTimePicker").destroy();
+			}
+		    
+		    datetime.datetimepicker({
+		    	locale: locale,
+		        inline: true,
+		        sideBySide: false
+		    });
+
+		    cancel.on("click", function () {
+		    	popover.popover('hide');
+		    });	
+
+		    save.on("click", function () {
+		    	var field = form.find('.meta');
+		    	field.val(datetime.data('date'));
+		    	console.log(form.serialize());
+		    });
+		}
+	}); 
+});
+</script>
\ No newline at end of file
diff --git a/notifications/utils.py b/notifications/utils.py
index 32ba0c6..76a4570 100644
--- a/notifications/utils.py
+++ b/notifications/utils.py
@@ -28,6 +28,7 @@ def set_notifications():
 		for user in users:
 			prev_notify = Notification.objects.filter(user = user, task = pendency).order_by("-creation_date")
 			notify_type = 1
+			meta = None
 
 			if prev_notify.count() > 0:
 				last_notify = prev_notify[0]
@@ -36,9 +37,10 @@ def set_notifications():
 					continue
 
 				if last_notify.meta:
-					if last_notify.creation_date < date.today() < last_notify.meta:
+					if last_notify.creation_date < date.today() < last_notify.meta.date():
 						continue
 
+					meta = last_notify.meta
 					notify_type = 2
 
 			has_action = Log.objects.filter(user_id = user.id, action = pend_action, resource = resource_type, context__contains = {resource_key: resource_id}, datetime__date__gte = subject_begin_date).exists()
@@ -51,12 +53,12 @@ def set_notifications():
 				if pendency.limit_date:
 					if timezone.now() > pendency.limit_date:
 						notify_type = 4
-
 				
 				notification = Notification()
 				notification.user = user
 				notification.level = notify_type
 				notification.task = pendency
+				notification.meta = meta
 
 				notification.save()
 
diff --git a/subjects/migrations/0014_auto_20170130_1828.py b/subjects/migrations/0014_auto_20170130_1828.py
new file mode 100644
index 0000000..19c6e4d
--- /dev/null
+++ b/subjects/migrations/0014_auto_20170130_1828.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2017-01-30 21:28
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('subjects', '0013_auto_20170120_1610'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='subject',
+            name='tags',
+            field=models.ManyToManyField(blank=True, to='subjects.Tag', verbose_name='tags'),
+        ),
+    ]
diff --git a/topics/templates/topics/list.html b/topics/templates/topics/list.html
index 04181e3..11f5d3b 100644
--- a/topics/templates/topics/list.html
+++ b/topics/templates/topics/list.html
@@ -34,7 +34,7 @@
 		                </div>
 		            </div>
 		        </div>
-			    <div id="{{topic.slug}}" class="panel-collapse collapse category-panel-content">
+			    <div id="{{topic.slug}}" class="panel-collapse collapse category-panel-content topic-panel">
 			    	<input type="hidden" class="id_inp" name="id" value="{{ topic.id }}" />
 			    	<input type="hidden" class="order_inp" name="order" value="{{ topic.order }}" />
 
--
libgit2 0.21.2