diff --git a/lib/assets/js/comment-form-animation.js b/lib/assets/js/comment-form-animation.js
index 83c1ef2f1..5ee42e74f 100644
--- a/lib/assets/js/comment-form-animation.js
+++ b/lib/assets/js/comment-form-animation.js
@@ -16,7 +16,7 @@ function showForm(button) {
 $(document).click(function(event) {
   if(!$(event.target).closest('#commentform').length && !$(event.target).closest('#button-create').length) {
     var commentform = document.getElementById("commentform");
-    if(commentform.className == "show") {
+    if(commentform && commentform.className == "show") {
       button = document.getElementsByClassName('fas fa-times')[0];
       makeFormDisappear(commentform, button);
     }
diff --git a/lib/scss/6_components/_conversations.scss b/lib/scss/6_components/_conversations.scss
index ee3fbe523..308a270d6 100644
--- a/lib/scss/6_components/_conversations.scss
+++ b/lib/scss/6_components/_conversations.scss
@@ -11,6 +11,7 @@ $profile-label-clear-color: #30BFD3 !default;
 
 .ConversationList {
     @extend .Container;
+    max-width: 100%;
 
     p {
         padding: 0 $spacing-unit / 3;
diff --git a/lib/scss/6_components/generic/_page-header.scss b/lib/scss/6_components/generic/_page-header.scss
index 4b39e8e84..eacdc8e32 100644
--- a/lib/scss/6_components/generic/_page-header.scss
+++ b/lib/scss/6_components/generic/_page-header.scss
@@ -41,6 +41,13 @@ $header-box-shadow-lower: 0 -2px 4px 0 rgba(0, 0, 0, 0.2) !default;
 
     &-topIcon {
         cursor: pointer;
+        display: none;
+    }
+
+    @media only screen and (max-width: 960px) {
+        &-topIcon {
+            display: block;
+        }
     }
 
     // Elements
diff --git a/lib/scss/6_components/generic/_page.scss b/lib/scss/6_components/generic/_page.scss
index 3e8b9fbb3..eca2e0526 100644
--- a/lib/scss/6_components/generic/_page.scss
+++ b/lib/scss/6_components/generic/_page.scss
@@ -23,6 +23,26 @@ $page-title-font-size: 1.1 * $font-size-h1 !default;
         }
     }
 
+    &-content-container {
+        display: flex;
+
+        .NavMenu {
+            position: fixed;
+        }
+    }
+    
+    @media only screen and (min-width: 960px) {
+        &-content.logged-in, #docs {
+            padding-left: 400px !important;
+        }
+    }
+    
+    @media only screen and (max-width: 960px) {
+        .NavMenu-fixed {
+            display: none;
+        }
+    }
+
     &-mainContainer {
         background: $page-background-image;
         background-size: contain;
diff --git a/locale/pt_BR/LC_MESSAGES/django.mo b/locale/pt_BR/LC_MESSAGES/django.mo
index e71eb3d4b..9687aa12e 100644
Binary files a/locale/pt_BR/LC_MESSAGES/django.mo and b/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/locale/pt_BR/LC_MESSAGES/django.po b/locale/pt_BR/LC_MESSAGES/django.po
index fef498d11..4b37a5ed1 100644
--- a/locale/pt_BR/LC_MESSAGES/django.po
+++ b/locale/pt_BR/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-06 16:51+0000\n"
-"PO-Revision-Date: 2018-11-06 15:03-0200\n"
+"POT-Creation-Date: 2018-11-14 03:05+0000\n"
+"PO-Revision-Date: 2018-11-14 01:09-0200\n"
 "Last-Translator: Fábio Mendes <fabiomacedomendes@gmail.com>\n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -837,23 +837,33 @@ msgstr "promovido?"
 msgid "Promoted conversations appears in the main /conversations/ endpoint."
 msgstr "Conversas promovidas aparecem no mural principal /conversations."
 
-#: src/ej_conversations/models/conversation.py:82
+#: src/ej_conversations/models/conversation.py:71
+msgid "hidden?"
+msgstr "oculta?"
+
+#: src/ej_conversations/models/conversation.py:74
+msgid ""
+"Hidden conversations does not appears in boards or in the main /"
+"conversations/ endpoint."
+msgstr "Conversas ocultas não aparecem no mural principal /conversations/"
+
+#: src/ej_conversations/models/conversation.py:90
 msgid "Can publish promoted conversations"
 msgstr "Pode publicar conversas promovidas"
 
-#: src/ej_conversations/models/conversation.py:83
+#: src/ej_conversations/models/conversation.py:91
 msgid "Can moderate comments in any conversation"
 msgstr "Pode moderar comentários em qualquer conversa"
 
-#: src/ej_conversations/models/conversation.py:98
+#: src/ej_conversations/models/conversation.py:106
 msgid "User does not have permission to create a promoted conversation."
 msgstr "Usuário não tem permissão para criar uma conversa promovida."
 
-#: src/ej_conversations/models/conversation.py:153
+#: src/ej_conversations/models/conversation.py:161
 msgid "automatically rejected"
 msgstr "rejeitado automaticamente"
 
-#: src/ej_conversations/models/conversation.py:242
+#: src/ej_conversations/models/conversation.py:250
 msgid "No comments available for this user"
 msgstr "Não há comentários disponíveis para esse usuário"
 
@@ -888,7 +898,7 @@ msgstr "Criado em"
 msgid "non-moderated comments cannot receive votes"
 msgstr "comentários não-moderados não podem receber votos"
 
-#: src/ej_conversations/roles.py:76
+#: src/ej_conversations/roles.py:76 src/ej_conversations/roles.py:140
 #: src/ej_conversations/routes/conversations.py:85
 msgid "login"
 msgstr "entrar"
@@ -1394,23 +1404,38 @@ msgstr "endereço de email"
 msgid "User token"
 msgstr "Token do usuário"
 
-#: src/ej_users/routes.py:71
+#: src/ej_users/routes.py:69
 msgid "Invalid email or password"
 msgstr "Email ou senha inválidos"
 
-#: src/ej_users/routes.py:160
+#: src/ej_users/routes.py:151
 msgid "Please reset your password"
 msgstr "Por favor reset sua senha"
 
-#: src/ej/templates/jinja2/base.jinja2:87
+#: src/ej_users/routes.py:198
+#, python-brace-format
+msgid ""
+"\n"
+"    Hello! You can use the following link to reset your password:\n"
+"    {link}\n"
+"    Thanks,\n"
+"    Your friends at Empurrando Juntos."
+msgstr ""
+"\n"
+"    Olá! Você pode usar o seguinte link para resetar sua senha:\n"
+"    {link}\n"
+"    Obrigada,\n"
+"    Suas amigas da Empurrando Juntas."
+
+#: src/ej/templates/jinja2/base.jinja2:88
 msgid "EJ - A platform of social participation."
 msgstr "EJ - Uma plataforma para participação social."
 
-#: src/ej/templates/jinja2/base.jinja2:96
+#: src/ej/templates/jinja2/base.jinja2:97
 msgid "EJ - A platform of social participacion."
 msgstr "EJ - Uma plataforma para participação social."
 
-#: src/ej/templates/jinja2/base.jinja2:134
+#: src/ej/templates/jinja2/base.jinja2:142
 msgid "Please override the \"content\" block of your template!"
 msgstr "Por favor substitua o bloco \"content\" do seu template!"
 
@@ -1432,31 +1457,32 @@ msgstr "Começar agora!"
 msgid "LOGIN"
 msgstr "ENTRAR"
 
-#: src/ej/templates/jinja2/components/generic/page_header.jinja2:64
+#: src/ej/templates/jinja2/components/generic/page_header.jinja2:65
+#: src/ej/templates/jinja2/components/generic/page_header.jinja2:69
 msgid "Back"
 msgstr "Voltar"
 
-#: src/ej/templates/jinja2/components/generic/page_header.jinja2:69
-#: src/ej/templates/jinja2/components/generic/page_header.jinja2:85
+#: src/ej/templates/jinja2/components/generic/page_header.jinja2:74
+#: src/ej/templates/jinja2/components/generic/page_header.jinja2:90
 msgid "Site logo"
 msgstr "Logo do site"
 
-#: src/ej/templates/jinja2/components/generic/page_header.jinja2:72
-#: src/ej/templates/jinja2/components/generic/page_header.jinja2:79
+#: src/ej/templates/jinja2/components/generic/page_header.jinja2:77
+#: src/ej/templates/jinja2/components/generic/page_header.jinja2:84
 msgid "Navigation menu"
 msgstr "Menu de navegação"
 
-#: src/ej/templates/jinja2/components/generic/page_header.jinja2:102
-#: src/ej/templates/jinja2/components/generic/page_header.jinja2:103
-#: src/ej/templates/jinja2/components/generic/page_header.jinja2:104
+#: src/ej/templates/jinja2/components/generic/page_header.jinja2:107
+#: src/ej/templates/jinja2/components/generic/page_header.jinja2:108
+#: src/ej/templates/jinja2/components/generic/page_header.jinja2:109
 #: src/ej_rocketchat/jinja2/ej_rocketchat/iframe.jinja2:2
 #: src/ej_rocketchat/jinja2/ej_rocketchat/intro.jinja2:3
 msgid "Panel"
 msgstr "Painel"
 
-#: src/ej/templates/jinja2/components/generic/page_header.jinja2:108
-#: src/ej/templates/jinja2/components/generic/page_header.jinja2:109
-#: src/ej/templates/jinja2/components/generic/page_header.jinja2:110
+#: src/ej/templates/jinja2/components/generic/page_header.jinja2:113
+#: src/ej/templates/jinja2/components/generic/page_header.jinja2:114
+#: src/ej/templates/jinja2/components/generic/page_header.jinja2:115
 #: src/ej/templates/jinja2/components/generic/page_menu.jinja2:30
 msgid "Profile"
 msgstr "Perfil"
@@ -2001,11 +2027,11 @@ msgstr "para ver {}."
 msgid "CREATE COMMENT"
 msgstr "CRIAR COMENTÁRIO"
 
-#: src/ej_conversations/jinja2/ej_conversations/detail.jinja2:39
+#: src/ej_conversations/jinja2/ej_conversations/detail.jinja2:40
 msgid "{}/{} comment{}."
 msgstr "{}/{} commentário{}."
 
-#: src/ej_conversations/jinja2/ej_conversations/detail.jinja2:40
+#: src/ej_conversations/jinja2/ej_conversations/detail.jinja2:41
 msgid "{} waiting moderation."
 msgstr "{} aguardando moderação."
 
@@ -2190,6 +2216,20 @@ msgstr "Registre agora!"
 msgid "or sign up through other networks"
 msgstr "ou entre usando outras redes"
 
+#: src/ej_users/jinja2/ej_users/recover-password-message.jinja2:2
+msgid ""
+"Hello !\n"
+"    You can use the following link to reset your password:\n"
+"    {{ link }}\n"
+"    Thanks,\n"
+"    Your friends at Empurrando Juntos."
+msgstr ""
+"Olá !\n"
+"    Você pode usar o seguinte link para resetar sua senha:\n"
+"    {{ link }}\n"
+"    Obrigada,\n"
+"    Suas amigas da Empurrando Juntas."
+
 #: src/ej_users/jinja2/ej_users/recover-password.jinja2:3
 #: src/ej_users/jinja2/ej_users/remove-account.jinja2:2
 msgid "Reset password"
@@ -2329,14 +2369,6 @@ msgstr "Atualizar"
 #~ "Exemplo: Prezado usuário, seu comentário foi rejeitado porque contém "
 #~ "conteúdo discriminatório."
 
-#, fuzzy
-#~ msgid ""
-#~ "Hello ! \n"
-#~ " You can use the following link to reset your password:"
-#~ msgstr ""
-#~ "Esqueceu sua senha? Insira seu endereço de e-mail abaixo, e nós vamos lhe "
-#~ "enviar uma mensagem com instruções para recriar sua senha."
-
 #~ msgid "Create conversation"
 #~ msgstr "Criar conversa"
 
diff --git a/src/ej/settings/__init__.py b/src/ej/settings/__init__.py
index fc8b9e274..0862b1be6 100644
--- a/src/ej/settings/__init__.py
+++ b/src/ej/settings/__init__.py
@@ -92,6 +92,16 @@ class Conf(ThemesConf,
     #     'REGISTER_SERIALIZER': 'ej_users.serializers.RegistrationSerializer'
     # }
 
+    # Use this variable to change the ej environment during the docker build step.
+    ENVIRONMENT = 'local'
+
+    if (ENVIRONMENT == 'production'):
+      EMAIL_BACKEND = 'anymail.backends.mailgun.EmailBackend';
+      # the api key will be informed during the docker build step.
+      ANYMAIL = {'MAILGUN_API_KEY': ''};
+      DEFAULT_FROM_EMAIL = "Empurrando Juntos <noreply@mail.ejplatform.org>"
+      HOSTNAME = 'https://ejplatform.org'
+
 
 
 Conf.save_settings(globals())
diff --git a/src/ej/templates/jinja2/base.jinja2 b/src/ej/templates/jinja2/base.jinja2
index d10c30ae5..f98f886cd 100644
--- a/src/ej/templates/jinja2/base.jinja2
+++ b/src/ej/templates/jinja2/base.jinja2
@@ -1,6 +1,6 @@
 {% from 'components/generic/page_header.jinja2' import page_header %}
 {% from 'components/generic/page_top-header.jinja2' import page_top_header %}
-{% from 'components/generic/page_menu.jinja2' import sidebar %}
+{% from 'components/generic/page_menu.jinja2' import menu with context %}
 
 {% set javascript_enabled = request.COOKIES.get('javascriptEnabled', 'No Cookie') if request else True %}
 {% set target_context = request.GET.target|default('all') if request else 'all' %}
@@ -9,6 +9,7 @@
 {% set page_title = page_title|default(content_title or settings.EJ_PAGE_TITLE) %}
 {% set hide_footer = hide_footer|default(False) %}
 {% set enable_navbar = enable_navbar|default(True) %}
+{% set logged_in = request and request.user and request.user.is_authenticated %}
 
 {% if target == 'all' %}
     <!DOCTYPE html>
@@ -116,27 +117,35 @@
         <div class="Page-mainContainer">
     {% endif %}
 
-    {# MAIN BLOCK #}
-    {% block main %}
-
-        <main class="Page-content" {{ salt_attr()|safe }}>
-            {% if content_title %}
-                <div class="Page-title"><h1>{{ content_title }}</h1></div>{% endif %}
-            {% if content is defined %}
-                {{ content }}
-            {% else %}
-                {% block content %}
-                    {% if content_html %}
-                        <div class="Container">
-                            {{ content_html|safe }}
-                        </div>
-                    {% else %}
-                        <p>{{ _('Please override the "content" block of your template!') }}</p>
-                    {% endif %}
-                {% endblock %}
+    <div class="Page-content-container">
+        <div class="NavMenu-fixed">
+            {% if logged_in and request.path != '/home/' %}
+                {{ menu(request.user) }}
             {% endif %}
-        </main>
-    {% endblock %}
+        </div>
+
+        {# MAIN BLOCK #}
+        {% block main %}
+
+            <main class="Page-content {{ 'logged-in' if logged_in else '' }}" {{ salt_attr()|safe }}>
+                {% if content_title %}
+                    <div class="Page-title"><h1>{{ content_title }}</h1></div>{% endif %}
+                {% if content is defined %}
+                    {{ content }}
+                {% else %}
+                    {% block content %}
+                        {% if content_html %}
+                            <div class="Container">
+                                {{ content_html|safe }}
+                            </div>
+                        {% else %}
+                            <p>{{ _('Please override the "content" block of your template!') }}</p>
+                        {% endif %}
+                    {% endblock %}
+                {% endif %}
+            </main>
+        {% endblock %}
+    </div>
 
 
 {% endblock %}
diff --git a/src/ej/templates/jinja2/components/generic/page_header.jinja2 b/src/ej/templates/jinja2/components/generic/page_header.jinja2
index 7785c6f1f..ed4c83f4f 100644
--- a/src/ej/templates/jinja2/components/generic/page_header.jinja2
+++ b/src/ej/templates/jinja2/components/generic/page_header.jinja2
@@ -35,11 +35,12 @@
         <script type="text/javascript">
             // this function controls the open/close button of "conversations dropdown on page_menu
             function openDropDown(openDiv) {
-                let element = document.getElementsByClassName(openDiv);
-                if (element[0].style.display === "inline")
-                    element[0].style.display = "none";
+                let elements = document.getElementsByClassName(openDiv);
+                let element = ((elements.length > 1) ? elements[1] : elements[0]);
+                if (element.style.display === "inline")
+                    element.style.display = "none";
                 else
-                    element[0].style.display = "inline";
+                    element.style.display = "inline";
             }
         </script>
 
@@ -61,10 +62,15 @@
     {% endblock %}
     <nav class="Header-topNav">
         {% if request.path not in ['/start/', '/conversations/', '/home/'] %}
-            <a title="{{ _('Back') }}" class="Header-topIcon" onclick="history.back()">
-                <i class="fa fa-chevron-left"></i>
-            </a>
-
+            {% if not '/conversations/' in request.path %}
+                <a title="{{ _('Back') }}" class="Header-topIcon" onclick="history.back()">
+                    <i class="fa fa-chevron-left"></i>
+                </a>
+            {% else %}
+                <a href="{{request.path.split('/conversations/')[0] + '/conversations/'}}" title="{{ _('Back') }}" class="Header-topIcon">
+                    <i class="fa fa-chevron-left"></i>
+                </a>
+            {% endif %}
             {% call link(href='/', class="Header-ejLogo") %}
                 <img src="/static/img/logo/logo.svg" alt="{{_('Site logo')}}">
             {% endcall %}
diff --git a/src/ej/templates/jinja2/pages/home.jinja2 b/src/ej/templates/jinja2/pages/home.jinja2
index 32d38cb5a..fa7a21a49 100644
--- a/src/ej/templates/jinja2/pages/home.jinja2
+++ b/src/ej/templates/jinja2/pages/home.jinja2
@@ -53,7 +53,7 @@
         <div><img src="/static/img/home/cellphone.png" alt="" /></div>
       </div>
 
-      <p>{{ action_button(_('Create a conversation'), '/conversations/add')}}</p>
+      <p>{{ action_button(_('Create a conversation'), '/profile/boards/add')}}</p>
     </div>
 
     <div id="HomeCommercial-documentation">
diff --git a/src/ej_boards/routes.py b/src/ej_boards/routes.py
index 4263759c9..847068af2 100644
--- a/src/ej_boards/routes.py
+++ b/src/ej_boards/routes.py
@@ -40,7 +40,7 @@
 @urlpatterns.route('<model:board>/conversations/')
 def conversation_list(request, board):
     user = request.user
-    conversations = board.conversations.all()
+    conversations = board.conversations.filter(is_hidden=False)
     board_user = board.owner
     boards = []
     boards_count = 0
diff --git a/src/ej_boards/tests/test_routes.py b/src/ej_boards/tests/test_routes.py
index fb1ce1c76..ac7ec8de6 100644
--- a/src/ej_boards/tests/test_routes.py
+++ b/src/ej_boards/tests/test_routes.py
@@ -107,7 +107,7 @@ def test_conversation_detail(self, rf, db, board, conversation):
         board.add_conversation(conversation)
         response = routes.conversation_detail(request, board, conversation)
         assert response['conversation'] == conversation
-        assert response['can_view_comment']
+        assert response['can_comment']
         assert response['can_edit']
 
     def test_conversation_detail_post_comment(self, rf, db, board, conversation):
@@ -120,7 +120,7 @@ def test_conversation_detail_post_comment(self, rf, db, board, conversation):
         board.add_conversation(conversation)
         response = routes.conversation_detail(request, board, conversation)
         assert response['conversation'] == conversation
-        assert response['can_view_comment']
+        assert response['can_comment']
         assert response['can_edit']
         assert Comment.objects.filter(author=user)[0].content == 'test comment'
 
@@ -135,7 +135,7 @@ def test_conversation_detail_vote_comment(self, rf, db, board, conversation):
         board.add_conversation(conversation)
         response = routes.conversation_detail(request, board, conversation)
         assert response['conversation'] == conversation
-        assert response['can_view_comment']
+        assert response['can_comment']
         assert response['can_edit']
         assert votes_counter(comment) == 1
 
diff --git a/src/ej_conversations/admin.py b/src/ej_conversations/admin.py
index 8fc920f22..037d19c39 100644
--- a/src/ej_conversations/admin.py
+++ b/src/ej_conversations/admin.py
@@ -36,7 +36,7 @@ class CommentAdmin(AuthorIsUserMixin, admin.ModelAdmin):
 
 @admin.register(models.Conversation)
 class ConversationAdmin(AuthorIsUserMixin, admin.ModelAdmin):
-    fields = ['title', 'text', 'is_promoted']
-    list_display = ['title', 'slug', 'author', 'created', 'is_promoted']
-    list_filter = ['created', 'is_promoted']
-    list_editable = ['is_promoted']
+    fields = ['title', 'text', 'is_promoted', 'is_hidden']
+    list_display = ['title', 'slug', 'author', 'created', 'is_promoted', 'is_hidden']
+    list_filter = ['created', 'is_promoted', 'is_hidden']
+    list_editable = ['is_promoted', 'is_hidden']
diff --git a/src/ej_conversations/jinja2/ej/role/comment-form.jinja2 b/src/ej_conversations/jinja2/ej/role/comment-form.jinja2
index 719ba7ce0..631c1bf46 100644
--- a/src/ej_conversations/jinja2/ej/role/comment-form.jinja2
+++ b/src/ej_conversations/jinja2/ej/role/comment-form.jinja2
@@ -28,7 +28,7 @@
     <h1>{% trans %}Leave your comment{% endtrans %}</h1>
         <p>{{ _('You still have {n} available comments').format(n=comments_left) }}</p>
         {{ comment_form(csrf_input, comment_content) }}
-    {% elif comments_left == 0 %}
+    {% elif can_comment and comments_left == 0 %}
         <div class="CommentForm-toast">
             <h3>{% trans %}Ooops!{% endtrans %}</h3>
             <p>{% trans %}You reached the limit of comments in this conversation.{% endtrans %}</p>
diff --git a/src/ej_conversations/jinja2/ej/role/conversation-card.jinja2 b/src/ej_conversations/jinja2/ej/role/conversation-card.jinja2
index 973efe0be..781fa3fd6 100644
--- a/src/ej_conversations/jinja2/ej/role/conversation-card.jinja2
+++ b/src/ej_conversations/jinja2/ej/role/conversation-card.jinja2
@@ -22,7 +22,7 @@
         </div>
         <div class="ConversationCard-actions">{{ action_button(_('Participate now!'), url) }}</div>
     </div>
-    {% if is_author %}
+    {% if user_can_moderate %}
         <a class="ConversationCard-moderation" href="{{ url }}moderate/">
             <i class="fas fa-cog"></i> {{ _('Moderate Conversation') }}
         </a>
diff --git a/src/ej_conversations/jinja2/ej_conversations/detail.jinja2 b/src/ej_conversations/jinja2/ej_conversations/detail.jinja2
index 748dc972f..b2c4a18ed 100644
--- a/src/ej_conversations/jinja2/ej_conversations/detail.jinja2
+++ b/src/ej_conversations/jinja2/ej_conversations/detail.jinja2
@@ -36,7 +36,8 @@
                     <i class="fas fa-plus"></i> {{ _("CREATE COMMENT") }}
                 </button>
             </p>
-            <p>{{ _("{}/{} comment{}.").format(comments_made, max_comments, "" if max_comments == 1 else "s")}}</p>
+            
+            <p>{{ _("{}/{} comment{}.").format(comments_made, max_comments if can_comment else 0, "" if max_comments == 1 else "s")}}</p>
             <p>{{ _("{} waiting moderation.").format(comments_under_moderation)}}</p>
         </div>
     </div>
diff --git a/src/ej_conversations/migrations/0004_update_fields.py b/src/ej_conversations/migrations/0004_update_fields.py
new file mode 100644
index 000000000..2afaef2f2
--- /dev/null
+++ b/src/ej_conversations/migrations/0004_update_fields.py
@@ -0,0 +1,40 @@
+# Generated by Django 2.1.2 on 2018-11-07 14:03
+
+import django.core.validators
+from django.db import migrations, models
+import ej_conversations.validators
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ej_conversations', '0003_conversation_hidden'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='taggedconversation',
+            name='content_object',
+        ),
+        migrations.RemoveField(
+            model_name='taggedconversation',
+            name='tag',
+        ),
+        migrations.RemoveField(
+            model_name='conversation',
+            name='hidden',
+        ),
+        migrations.AddField(
+            model_name='conversation',
+            name='is_hidden',
+            field=models.BooleanField(default=False, help_text='Hidden conversations does not appears in boards or in the main /conversations/ endpoint.', verbose_name='hidden?'),
+        ),
+        migrations.AlterField(
+            model_name='comment',
+            name='content',
+            field=models.TextField(help_text='Body of text for the comment', max_length=252, validators=[django.core.validators.MinLengthValidator(2), ej_conversations.validators.is_not_empty], verbose_name='Content'),
+        ),
+        migrations.DeleteModel(
+            name='TaggedConversation',
+        ),
+    ]
diff --git a/src/ej_conversations/models/conversation.py b/src/ej_conversations/models/conversation.py
index a2e067c1c..0deed4d3a 100644
--- a/src/ej_conversations/models/conversation.py
+++ b/src/ej_conversations/models/conversation.py
@@ -67,6 +67,14 @@ class Conversation(TimeStampedModel):
             'endpoint.'
         ),
     )
+    is_hidden = models.BooleanField(
+        _('hidden?'),
+        default=False,
+        help_text=_(
+            'Hidden conversations does not appears in boards or in the main /conversations/ '
+            'endpoint.'
+        ),
+    )
 
     objects = ConversationManager()
     tags = TaggableManager(through='ConversationTag')
@@ -123,7 +131,7 @@ def user_votes(self, user):
         """
         if user.id is None:
             return Vote.objects.none()
-        return Vote.objects.filter(comment__conversation=self, author=user)
+        return Vote.objects.filter(comment__conversation=self, author=user, comment__status=Comment.STATUS.approved)
 
     def create_comment(self, author, content, commit=True, *, status=None,
                        check_limits=True, **kwargs):
diff --git a/src/ej_conversations/roles.py b/src/ej_conversations/roles.py
index 52019e3e4..8d59afab9 100644
--- a/src/ej_conversations/roles.py
+++ b/src/ej_conversations/roles.py
@@ -18,7 +18,7 @@ def conversation_card(conversation, request=None, url=None, **kwargs):
     """
 
     user = getattr(request, 'user', None)
-    is_author = conversation.author == user
+    can_moderate = user.has_perm('ej.can_moderate_conversation', conversation)
     return {
         'conversation': conversation,
         'url': url or conversation.get_absolute_url(),
@@ -26,7 +26,7 @@ def conversation_card(conversation, request=None, url=None, **kwargs):
         'n_comments': conversation.approved_comments.count(),
         'n_votes': conversation.vote_count(),
         'n_followers': conversation.followers.count(),
-        'is_author': is_author,
+        'user_can_moderate': can_moderate,
         **kwargs,
     }
 
@@ -135,10 +135,14 @@ def comment_form(conversation, request=None, comment_content=None, **kwargs):
     """
     user = getattr(request, 'user', None)
     n_comments = rules.compute('ej_conversations.remaining_comments', conversation, user)
+    conversation_url = conversation.get_absolute_url()
+    login = reverse('auth:login')
+    login_anchor = a(_('login'), href=f'{login}?next={conversation_url}')
     return {
-        'can_comment': user.has_perm('ej.can_comment', conversation),
+        'can_comment': user.is_authenticated,
         'comments_left': n_comments,
         'user_is_owner': conversation.author == user,
         'csrf_input': csrf_input(request),
         'comment_content': comment_content,
+        'login_anchor': login_anchor,
     }
diff --git a/src/ej_conversations/routes/admin.py b/src/ej_conversations/routes/admin.py
index 826143c59..b899b3d72 100644
--- a/src/ej_conversations/routes/admin.py
+++ b/src/ej_conversations/routes/admin.py
@@ -10,8 +10,12 @@
 log = getLogger('ej')
 
 
-@urlpatterns.route('add/', login=True, perms=['ej.can_add_promoted_conversation'])
+@urlpatterns.route('add/', login=True)
 def create(request):
+    # TODO: Fix this case of permission in django-boogie
+    if not request.user.has_perm('ej.can_add_promoted_conversation'):
+        raise Http404
+
     form = forms.ConversationForm(request.POST or None)
     if request.method == 'POST' and form.is_valid():
         with transaction.atomic():
diff --git a/src/ej_conversations/routes/conversations.py b/src/ej_conversations/routes/conversations.py
index 58025a9f0..2fc39f664 100644
--- a/src/ej_conversations/routes/conversations.py
+++ b/src/ej_conversations/routes/conversations.py
@@ -17,7 +17,7 @@
 @urlpatterns.route('', name='list')
 def conversation_list(request):
     return {
-        'conversations': Conversation.objects.filter(is_promoted=True),
+        'conversations': Conversation.objects.filter(is_promoted=True, is_hidden=False),
         'can_add_conversation': request.user.has_perm('ej.can_add_promoted_conversation'),
         'create_url': reverse('conversation:create'),
         'topic': _('A space for adolescents to discuss actions that promote, guarantee and defend their rights'),
@@ -87,7 +87,7 @@ def get_conversation_detail_context(request, conversation):
 
         # Permissions and predicates
         'is_favorite': is_favorite,
-        'can_view_comment': user.is_authenticated,
+        'can_comment': user.is_authenticated,
         'can_edit': user.has_perm('ej.can_edit_conversation', conversation),
         'cannot_comment_reason': '',
         'comments_under_moderation': n_comments_under_moderation,
diff --git a/src/ej_conversations/rules.py b/src/ej_conversations/rules.py
index 2b5878748..4c0fefa79 100644
--- a/src/ej_conversations/rules.py
+++ b/src/ej_conversations/rules.py
@@ -146,14 +146,14 @@ def can_comment(user, conversation):
 
 
 @rules.register_perm('ej.can_add_promoted_conversation')
-def can_add_promoted_conversation(user, conversation):
+def can_add_promoted_conversation(user):
     """
-    Check if user can comment in conversation.
+    Check if user can add a promoted conversation
 
     * Has explicit 'ej_conversations.can_publish_promoted' permission
       stored in the db.
     """
-    return user.has_perm('ej_conversations.can_publish_promoted', conversation)
+    return user.has_perm('ej_conversations.can_publish_promoted')
 
 
 @rules.register_perm('ej.can_edit_conversation')
diff --git a/src/ej_conversations/tests/conftest.py b/src/ej_conversations/tests/conftest.py
index b543bd832..f8cceecbc 100644
--- a/src/ej_conversations/tests/conftest.py
+++ b/src/ej_conversations/tests/conftest.py
@@ -12,6 +12,10 @@
 def user(db):
     user = User.objects.create_user('email@server.com', 'password')
     user.board_name = 'testboard'
+
+    # TODO: Fix this dirty way to set user permissions
+    user.has_perm = lambda x, y=None: True
+
     user.save()
     return user
 
diff --git a/src/ej_conversations/tests/test_routes.py b/src/ej_conversations/tests/test_routes.py
index caa3a809f..9e585c09a 100644
--- a/src/ej_conversations/tests/test_routes.py
+++ b/src/ej_conversations/tests/test_routes.py
@@ -9,7 +9,7 @@ class TestRoutes(UrlTester, ConversationRecipes):
         '/conversations/',
         '/conversations/conversation/',
     ]
-    login_urls = [
+    admin_urls = [
         '/conversations/add/',
     ]
     owner_urls = [
diff --git a/src/ej_profiles/migrations/0003_update_image_field.py b/src/ej_profiles/migrations/0003_update_image_field.py
new file mode 100644
index 000000000..111afd7ca
--- /dev/null
+++ b/src/ej_profiles/migrations/0003_update_image_field.py
@@ -0,0 +1,22 @@
+# Generated by Django 2.1.2 on 2018-11-08 14:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ej_profiles', '0002_add_state_field'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='profile',
+            name='image',
+        ),
+        migrations.AddField(
+            model_name='profile',
+            name='profile_photo',
+            field=models.ImageField(blank=True, null=True, upload_to='profile_images', verbose_name='Profile Photo'),
+        ),
+    ]
diff --git a/src/ej_users/jinja2/ej_users/recover-password-message.jinja2 b/src/ej_users/jinja2/ej_users/recover-password-message.jinja2
index d7b31642b..a0f4e1b59 100644
--- a/src/ej_users/jinja2/ej_users/recover-password-message.jinja2
+++ b/src/ej_users/jinja2/ej_users/recover-password-message.jinja2
@@ -1,7 +1,9 @@
 {% block content %}
-  Hello !
-  You can use the following link to reset your password:
-  {{ link }}
-  Thanks,
-  Your friends at Empurrando Juntos.
+  {{_(
+    "Hello !
+    You can use the following link to reset your password:
+    {{ link }}
+    Thanks,
+    Your friends at Empurrando Juntos."
+  )}}
 {% endblock %}
\ No newline at end of file
diff --git a/src/ej_users/routes.py b/src/ej_users/routes.py
index 474a56f15..e2b09c214 100644
--- a/src/ej_users/routes.py
+++ b/src/ej_users/routes.py
@@ -1,5 +1,4 @@
 import logging
-import os
 
 from django.conf import settings
 from django.contrib import auth
@@ -11,7 +10,6 @@
 from django.shortcuts import redirect
 from django.template.loader import get_template
 from django.utils.translation import ugettext_lazy as _
-from jinja2 import FileSystemLoader, Environment
 from rest_framework import status
 from rest_framework.authtoken.models import Token
 
@@ -134,14 +132,6 @@ def reset_password(request, token):
 @urlpatterns.route('recover-password/')
 def recover_password(request):
     form = forms.RecoverPasswordForm(request.POST or None)
-
-    dirname = os.path.dirname(__file__)
-    template_dir = os.path.join(dirname, 'jinja2/ej_users')
-
-    loader = FileSystemLoader(searchpath=template_dir)
-    environment = Environment(loader=loader)
-    template_file = "recover-password-message.jinja2"
-    template = environment.get_template(template_file)
     user = None
     success = False
 
@@ -152,13 +142,14 @@ def recover_password(request):
                 host = 'http://localhost:8000'
 
             else:
-                host = 'http://' + settings.HOSTNAME
+                host = settings.HOSTNAME
 
             user = User.objects.get_by_email(request.POST['email'])
             token = generate_token(user)
-            template_message = template.render({'link': host + '/reset-password/' + token.url})
+            from_email = settings.DEFAULT_FROM_EMAIL
+            template_message = _recover_password_message(host + '/reset-password/' + token.url)
             send_mail(_("Please reset your password"), template_message,
-                      'empurrandojuntos@gmail.com', [request.POST['email']],
+                      from_email, [request.POST['email']],
                       fail_silently=False)
 
     return {
@@ -200,3 +191,12 @@ def api_key(request):
 # Auxiliary functions and templates
 #
 login_extra_template = get_template('socialaccount/snippets/login_extra.html')
+
+
+# E-MAIL MESSAGE
+def _recover_password_message(link):
+    return _(f"""
+    Hello! You can use the following link to reset your password:
+    {link}
+    Thanks,
+    Your friends at Empurrando Juntos.""")