--- a/project/templates/_menu.html	Wed Sep 08 15:38:12 2010 +0530
+++ b/project/templates/_menu.html	Wed Sep 08 15:38:53 2010 +0530
@@ -3,9 +3,12 @@
     <li><a href="/{{ params.scope }}/">Home</a></li>
     <li><a href="/{{ params.scope }}/submit-registration/">Registration</a></li>
     <li>
-      <!--<a href="/{{ params.scope }}/talks-cfp/">-->Talks & CfP<!--</a>  -->
+      Talks & CfP
       <ul>
         <li>
+          <a href="/{{ params.scope }}/talks-cfp/">Call for Papers</a>
+        </li>
+        <li>
           <a href="/{{ params.scope }}/talks-cfp/schedule/">
             Conference Schedule
           </a>
@@ -26,11 +29,11 @@
             Speakers
           </a>
         </li>
-         
-        {% if user.is_authenticated %}
-          <li><a href="/talks-cfp/list-talks/{{ user.id }}">My talks</a></li>
+         -->
+        {% if user.is_authenticated and user.talk_set.all %}
+          <li><a href="/{{ params.scope }}/my-talks">My talks</a></li>
         {% endif %}
-        -->
+
       </ul>
     </li>
     <li>