diff --git a/app/Resources/views/main_template.html.twig b/app/Resources/views/main_template.html.twig
index 4216459..6c81703 100644
--- a/app/Resources/views/main_template.html.twig
+++ b/app/Resources/views/main_template.html.twig
@@ -28,8 +28,8 @@
 {% if group.group.open or group.membershipAcceptedAt %}
 								<dl><a href="{{ path('KekRozsakFrontBundle_groupView', {groupSlug: group.group.slug}) }}">{{ group.group.name }}</a></dl>
 {% endif %}
-								<dl><a href="{{ path('KekRozsakFrontBundle_groupList') }}">További csoportok</a></dl>
 {% endfor %}
+								<dl><a href="{{ path('KekRozsakFrontBundle_groupList') }}">További csoportok</a></dl>
 
 								<dt>Kedvenc Fórum-témáim</dt>
 
@@ -62,11 +62,6 @@
 					<li><a href="{{ path('KekRozsakSecurityBundle_registration') }}">Jelentkezés</a></li>
 {% endif %}
 				</ul>
-{% if app.user %}
-				<ul>
-					<li><a href="{{ path('KekRozsakFrontBundle_groupList') }}">Csoportok</a></li>
-				</ul>
-{% endif %}
 			</div>
 			<div id="header">
 				<h1><a href="{{ path('KekRozsakFrontBundle_homepage') }}"><img src="{{ asset('images/kek_rozsak_felirat.jpg') }}" alt="Kék Rózsák" /></a></h1>
diff --git a/src/KekRozsak/FrontBundle/Resources/views/Forum/topic_group_list.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Forum/topic_group_list.html.twig
index 3ebfeb7..d962698 100644
--- a/src/KekRozsak/FrontBundle/Resources/views/Forum/topic_group_list.html.twig
+++ b/src/KekRozsak/FrontBundle/Resources/views/Forum/topic_group_list.html.twig
@@ -19,8 +19,12 @@
 			<td><a href="{{ path('KekRozsakFrontBundle_forum_post_list', {topicGroupSlug: topicGroup.slug, topicSlug: topic.slug}) }}">{{ topic.title }}</a></td>
 			<td></td>
 			<td>
+{% if topic.lastPost %}
 				{{ topic.lastPost.createdBy.displayName }}<br />
 				{{ topic.lastPost.createdAt|date('Y-m-d H:i') }}
+{% else %}
+				&nbsp;<br />&nbsp;
+{% endif %}
 			</td>
 		</tr>
 {% endfor %}