diff --git a/core/static/css/base/amadeus.css b/core/static/css/base/amadeus.css
index 72d0bf9..b96f963 100644
--- a/core/static/css/base/amadeus.css
+++ b/core/static/css/base/amadeus.css
@@ -320,3 +320,5 @@ body .container .jumbotron-inverse, body .container .well-inverse, body .contain
 .notification-count {
     background-color: #FF0000;
 }
+
+.datepicker{z-index:9999 !important}
\ No newline at end of file
diff --git a/core/templates/base.html b/core/templates/base.html
index 01ec35a..14a3211 100644
--- a/core/templates/base.html
+++ b/core/templates/base.html
@@ -21,7 +21,7 @@
 	<link rel="stylesheet" type="text/css" href="{% static 'bootstrap-3.3.7/css/bootstrap.css' %}">
 	<link rel="stylesheet" type="text/css" href="{% static 'css/vendor/material.min.css' %}">
 	<link rel="stylesheet" type="text/css" href="{% static 'css/vendor/ripples.min.css' %}">
-	<link rel="stylesheet" type="text/css" href="{% static 'css/datepicker.css' %}">
+	<link rel="stylesheet" type="text/css" href="{% static 'css/vendor/datepicker.css' %}">
 	<script type="text/javascript" src="{% static 'bootstrap-3.3.7/js/bootstrap.js' %}"></script>
 	<script type="text/javascript" src="{% static 'js/vendor/bootstrap-acessibility.min.js' %}"></script>
 	<script type="text/javascript" src="{% static 'js/vendor/material.min.js' %}"></script>
@@ -38,7 +38,7 @@
 	<script type="text/javascript">$.material.init()</script>
 
 	<!--Javascript block for specific-app ones -->
-	<script src="{% static 'js/base/amadeus.js' %}"></script>
+	<script src="{% static 'js/main.js' %}"></script>
 	{% block style %}
 	{% endblock %}
 </head>
diff --git a/courses/templates/subject/form_view_student.html b/courses/templates/subject/form_view_student.html
index 3de7294..d1805f1 100644
--- a/courses/templates/subject/form_view_student.html
+++ b/courses/templates/subject/form_view_student.html
@@ -1,5 +1,9 @@
 {% load i18n %}
 
+{% block javascript %}
+    <script type="text/javascript" src="{% static 'js/forum.js' %}"></script>
+{% endblock %}
+
 <div class="panel panel-default">
     <a href="{% url 'course:view_topic' topic.slug %}">
         <div class="panel-heading">
@@ -13,4 +17,24 @@
 </div>
 <div class="panel-body">
     <p>{{topic.description|linebreaks}}</p>
+    {% list_topic_foruns request topic %}  
+</div>
+
+<div class="modal fade" id="forumModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title" id="myModalLabel">{% trans 'Forum' %}</h4>
+            </div>
+            <div class="modal-body">
+                <section>
+                    <div class="forum_topics"></div>
+                </section>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans 'Close' %}</button>
+                <button type="button" class="btn btn-primary btn-raised">{% trans 'Save changes' %}</button>
+            </div>
+        </div>
+    </div>
 </div>
\ No newline at end of file
diff --git a/courses/templates/subject/form_view_teacher.html b/courses/templates/subject/form_view_teacher.html
index f36f650..5cb754b 100644
--- a/courses/templates/subject/form_view_teacher.html
+++ b/courses/templates/subject/form_view_teacher.html
@@ -19,7 +19,10 @@
     </a>
     <div class="panel-body">
         <p>{{ topic.description|linebreaks }}</p>
-        {% list_topic_foruns request topic %}        
+        <button class="btn btn-primary btn-raised" onclick="createForum('{% url 'forum:create' %}', '{{ topic.id }}')">{% trans '+ Create Forum' %}</button>
+        <div class="foruns_list">
+            {% list_topic_foruns request topic %}
+        </div>
     </div>
 </div>
 
@@ -27,7 +30,7 @@
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h4 class="modal-title" id="myModalLabel">Forum</h4>
+                <h4 class="modal-title" id="myModalLabel">{% trans 'Forum' %}</h4>
             </div>
             <div class="modal-body">
                 <section>
@@ -40,4 +43,23 @@
             </div>
         </div>
     </div>
+</div>
+
+<div class="modal fade" id="createForum" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title" id="myModalLabel">{% trans 'Forum' %}</h4>
+            </div>
+            <div class="modal-body">
+                <section>
+                    <div class="forum_form"></div>
+                </section>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans 'Close' %}</button>
+                <button type="button" onclick="$('#forum_create').submit();" class="btn btn-primary btn-raised">{% trans 'Create' %}</button>
+            </div>
+        </div>
+    </div>
 </div>
\ No newline at end of file
diff --git a/forum/forms.py b/forum/forms.py
index 2304cce..ec1d2ff 100644
--- a/forum/forms.py
+++ b/forum/forms.py
@@ -6,17 +6,22 @@ class ForumForm(forms.ModelForm):
 
 	class Meta:
 		model = Forum
-		fields = ('name', 'description')
+		fields = ('name', 'limit_date', 'description', 'topic', )
 		labels = {
 			'name': _('Title'),
-			'description': _('Description')
+			'description': _('Description'),
+			'limit_date': _('Limit Date'),
 		}
 		help_texts = {
 			'name': _('Forum title'),
-			'description': _('What is this forum about?')
+			'description': _('What is this forum about?'),
+			'limit_date': _('Limit date for students post on this forum'),
 		}
 		widgets = {
-			'description': forms.Textarea(attrs={'cols': 80, 'rows': 5}),
+			'name': forms.TextInput(attrs={'class': 'form-control'}),
+			'description': forms.Textarea(attrs={'cols': 80, 'rows': 5, 'class': 'form-control'}),
+			'topic': forms.HiddenInput(),
+			'limit_date': forms.DateInput(attrs={'class': 'date-picker form-control'}),
 		}
 
 class PostForm(forms.ModelForm):
diff --git a/forum/templates/forum/forum_form.html b/forum/templates/forum/forum_form.html
index 06a4b8d..c3a13f3 100644
--- a/forum/templates/forum/forum_form.html
+++ b/forum/templates/forum/forum_form.html
@@ -1,30 +1,32 @@
 {% load static i18n %}
 {% load widget_tweaks %}
 
-<form method="post" action="" enctype="multipart/form-data">
+<form id="forum_create" method="post" action="{% url 'forum:create' %}" enctype="multipart/form-data">
 	{% csrf_token %}
 	{% for field in form %}
 		<div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput">
-			<label for="{{ field.auto_id }}">{{ field.label }}</label>
-			{% render_field field class='form-control' %}
-			<span class="help-block">{{ field.help_text }}</span>
-			{% if field.errors %}
-				<div class="row">
-					<br />
-					<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 field.errors %}
-								<li>{{ error }}</li>
-							{% endfor %}
-						</ul>
+			{% if field.field.widget.input_type == 'hidden' %}
+	            {% render_field field class='form-control' %}
+	        {% else %}
+				<label for="{{ field.auto_id }}">{{ field.label }}</label>
+				{% render_field field %}
+				<span class="help-block">{{ field.help_text }}</span>
+				{% if field.errors %}
+					<div class="row">
+						<br />
+						<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 field.errors %}
+									<li>{{ error }}</li>
+								{% endfor %}
+							</ul>
+						</div>
 					</div>
-				</div>
+				{% endif %}
 			{% endif %}
 		</div>
 	{% endfor %}
-
-	<input type="submit" value="{% trans 'Create' %}" class="btn btn-primary" />
 </form>
\ No newline at end of file
--
libgit2 0.21.2