diff --git a/lib/noticelistitem.php b/lib/noticelistitem.php
index 0527f0bf0c..57207339a9 100644
--- a/lib/noticelistitem.php
+++ b/lib/noticelistitem.php
@@ -200,10 +200,13 @@ class NoticeListItem extends Widget
                        'class' => 'h-card p-author',
                        'title' => $this->profile->getNickname());
 
-        $this->out->elementStart('a', $attrs);
-        $this->showAvatar($this->profile);
-        $this->out->text($this->profile->getStreamName());
-        $this->out->elementEnd('a');
+        if (Event::handle('StartShowNoticeItemAuthor', array($this->profile, $this->out, &$attrs))) {
+            $this->out->elementStart('a', $attrs);
+            $this->showAvatar($this->profile);
+            $this->out->text($this->profile->getStreamName());
+            $this->out->elementEnd('a');
+            Event::handle('EndShowNoticeItemAuthor', array($this->profile, $this->out));
+        }
     }
 
     function showAddressees()
diff --git a/lib/threadednoticelist.php b/lib/threadednoticelist.php
index e2f9f0955f..15d286dbf9 100644
--- a/lib/threadednoticelist.php
+++ b/lib/threadednoticelist.php
@@ -371,6 +371,11 @@ class ThreadedNoticeListMoreItem extends NoticeListItem
         $this->out->elementStart('li', array('class' => 'notice-reply-comments'));
     }
 
+    function showEnd()
+    {
+        $this->out->elementEnd('li');
+    }
+
     function showMiniForm()
     {
         $id = $this->notice->conversation;
diff --git a/plugins/ModPlus/ModPlusPlugin.php b/plugins/ModPlus/ModPlusPlugin.php
index 682545327d..945a649f30 100644
--- a/plugins/ModPlus/ModPlusPlugin.php
+++ b/plugins/ModPlus/ModPlusPlugin.php
@@ -83,9 +83,9 @@ class ModPlusPlugin extends Plugin
      * @param NoticeListItem $item
      * @return boolean hook value
      */
-    function onStartShowNoticeItem(NoticeListItem $item)
+    function onEndShowNoticeItemAuthor(Profile $profile, HTMLOutputter $out)
     {
-        $this->showProfileOptions($item->out, $item->profile);
+        $this->showProfileOptions($out, $profile);
         return true;
     }
 
diff --git a/plugins/ModPlus/css/modplus.css b/plugins/ModPlus/css/modplus.css
index 1e3e15dbb8..4113232484 100644
--- a/plugins/ModPlus/css/modplus.css
+++ b/plugins/ModPlus/css/modplus.css
@@ -5,7 +5,7 @@
     background: url(../../theme/base/images/icons/twotone/green/admin.gif) no-repeat 8px 8px white;
     border: solid 1px #c0c0c0;
 
-    margin-top: 56px;
+    margin-top: 32px;
 
     padding: 6px 16px;
     padding-left: 32px;