Index: /trunk/src/grails-app/domain/Entry.groovy
===================================================================
--- /trunk/src/grails-app/domain/Entry.groovy	(revision 49)
+++ /trunk/src/grails-app/domain/Entry.groovy	(revision 50)
@@ -18,4 +18,8 @@
         
     }
+
+    String toString() {
+        "${this.comments}"
+    }
 }
 
Index: /trunk/src/grails-app/domain/Task.groovy
===================================================================
--- /trunk/src/grails-app/domain/Task.groovy	(revision 49)
+++ /trunk/src/grails-app/domain/Task.groovy	(revision 50)
@@ -7,5 +7,5 @@
     Date targetDate
 
-    static hasMany = [entries: Entry, modifications : Modification]
+    static hasMany = [entries: Entry, modifications: Modification]
 
     static belongsTo = [TaskGroup, Person]
Index: /trunk/src/grails-app/views/_adminmenubar.gsp
===================================================================
--- /trunk/src/grails-app/views/_adminmenubar.gsp	(revision 49)
+++ /trunk/src/grails-app/views/_adminmenubar.gsp	(revision 50)
@@ -13,2 +13,3 @@
     </span>
 </g:if>
+
Index: /trunk/src/grails-app/views/person/login.gsp
===================================================================
--- /trunk/src/grails-app/views/person/login.gsp	(revision 49)
+++ /trunk/src/grails-app/views/person/login.gsp	(revision 50)
@@ -9,5 +9,5 @@
 
         <div class="body">
-            <h1>Please log in</h1>
+            <h1>Welcome to gnuMims please log in</h1>
             <g:if test="${flash.message}">
                 <div class="message">${flash.message}</div>
Index: /trunk/src/grails-app/views/task/edit.gsp
===================================================================
--- /trunk/src/grails-app/views/task/edit.gsp	(revision 49)
+++ /trunk/src/grails-app/views/task/edit.gsp	(revision 50)
@@ -14,8 +14,10 @@
         </div>
         <div class="body">
-            <h1>Edit Task</h1>
             <g:if test="${flash.message}">
             <div class="message">${flash.message}</div>
             </g:if>
+            <h1>Edit Task</h1>
+
+
             <g:hasErrors bean="${taskInstance}">
             <div class="errors">
@@ -25,4 +27,10 @@
             <g:form method="post" >
                 <input type="hidden" name="id" value="${taskInstance?.id}" />
+            <div class="buttons">
+                <span class="button"><g:actionSubmit class="save" value="Update" /></span>
+                <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+                <span class="menuButton"><g:link controller="entry" params="['task.id':taskInstance.id]" action="create">Add Entry</g:link></span>
+                <span class="menuButton"><g:link controller="modification" params="['task.id':taskInstance?.id]" action="list">Show Modifications</g:link></span>
+            </div>
                 <div class="dialog">
                     <table>
@@ -83,23 +91,8 @@
                                 </td>
                             </tr> 
-                            <tr class="prop">
-                                <td valign="top">
-                                    <g:link controller="entry" params="['task.id':taskInstance.id]" action="create">Add Entry</g:link>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top">
-<!--                                     <g:link controller="modification" params="['task.id':taskInstance?.id]" action="showModifications">Show Modifications</g:link> -->
-                                        <g:link controller="modification" params="['task.id':taskInstance?.id]" action="list">Show Modifications</g:link>
-                                </td>
-                            </tr>                         
                         </tbody>
                     </table>
                 </div>
-                <div class="buttons">
-                    <span class="button"><g:actionSubmit class="save" value="Update" /></span>
-                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
-                </div>
+
             </g:form>
         </div>
Index: /trunk/src/grails-app/views/task/show.gsp
===================================================================
--- /trunk/src/grails-app/views/task/show.gsp	(revision 49)
+++ /trunk/src/grails-app/views/task/show.gsp	(revision 50)
@@ -1,4 +1,2 @@
-
-
 <html>
     <head>
@@ -18,4 +16,12 @@
             <div class="message">${flash.message}</div>
             </g:if>
+            <div class="buttons">
+                <g:form>
+                    <input type="hidden" name="id" value="${taskInstance?.id}" />
+                    <span class="button"><g:actionSubmit class="edit" value="Edit" /></span>
+                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+                </g:form>
+            </div>
+
             <div class="dialog">
                 <table>
@@ -44,18 +50,7 @@
                         </tr>
                     
-                        <tr class="prop">
-                            <td valign="top" class="name">Entries:</td>
-                            
-                            <td  valign="top" style="text-align:left;" class="value">
-                                <ul>
-                                <g:each var="e" in="${taskInstance.entries}">
-                                    <li><g:link controller="entry" action="show" id="${e.id}">${e?.encodeAsHTML()}</g:link></li>
-                                </g:each>
-                                </ul>
-                            </td>
-                            
-                        </tr>
+
                     
-                        <tr class="prop">
+<!--                        <tr class="prop">
                             <td valign="top" class="name">Modifications:</td>
                             
@@ -68,5 +63,5 @@
                             </td>
                             
-                        </tr>
+                        </tr>-->
                     
                         <tr class="prop">
@@ -101,10 +96,41 @@
                 </table>
             </div>
-            <div class="buttons">
-                <g:form>
-                    <input type="hidden" name="id" value="${taskInstance?.id}" />
-                    <span class="button"><g:actionSubmit class="edit" value="Edit" /></span>
-                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
-                </g:form>
+            <div class="dialog">
+                <table>
+                    <tbody>
+                        <div  class="dialog">
+                            <tr class="prop">
+                                <td valign="top" class="name">Entries:</td>
+                                <td />
+                                <td />
+                                <td />
+                            </tr>
+                            <tr class="prop">
+                                <td />
+                                <td  valign="top" style="text-align:left;" class="value">
+                                    <g:each var="comment" in="${taskInstance.entries.comments}">
+                                        </br>
+                                        ${comment} 
+                                        </br>
+                                    </g:each>
+                                </td>
+                                <td  valign="top" style="text-align:left;" class="value">
+                                    <g:each var="date" in="${taskInstance.entries.date}">
+                                        </br>
+                                        ${date} 
+                                        </br>
+                                    </g:each>
+                                </td>
+                                <td  valign="top" style="text-align:left;" class="value">
+                                    <g:each var="person" in="${taskInstance.entries.person}">
+                                        </br>
+                                        ${person} 
+                                        </br>
+                                    </g:each>
+                                </td>
+                            </tr>
+                        </div>
+                    </tbody>
+                </table>
             </div>
         </div>
Index: /trunk/src/web-app/css/public.css
===================================================================
--- /trunk/src/web-app/css/public.css	(revision 49)
+++ /trunk/src/web-app/css/public.css	(revision 50)
@@ -56,5 +56,5 @@
     font-weight: normal;
     font-size: 16px;
-    margin: .8em 0 .3em 0;
+    margin: 0 0 .3em 0;
 }
 
@@ -152,5 +152,5 @@
     color: #006dba;
     margin: 10px 0 5px 0;
-    padding: 5px 5px 5px 30px
+    padding: 5px 5px 5px 0px
 }