diff --git a/src/View/Status.elm b/src/View/Status.elm
index f0e820e..d370061 100644
--- a/src/View/Status.elm
+++ b/src/View/Status.elm
@@ -198,10 +198,10 @@ statusActionsView status currentUser showApp =
               else
                 text ""
             , a
-                [ class baseBtnClasses, href (Maybe.withDefault "#" status.url), target "_blank" ]
-                [ Common.icon "time", text <| Common.formatDate status.created_at ]
+                [ class baseBtnClasses, href (Maybe.withDefault "#" sourceStatus.url), target "_blank" ]
+                [ Common.icon "time", text <| Common.formatDate sourceStatus.created_at ]
             , if showApp then
-                Common.appLink (baseBtnClasses ++ " applink") status.application
+                Common.appLink (baseBtnClasses ++ " applink") sourceStatus.application
               else
                 text ""
             ]
@@ -313,10 +313,7 @@ statusView context ({ account, content, media_attachments, reblog, mentions, pin
                     [ p [ class "status-info" ]
                         [ Common.icon "fire"
                         , a (accountLinkAttributes ++ [ class "reblogger" ])
-                            [ text <| " " ++ if account.display_name == "" then
-                                                account.username
-                                              else
-                                                account.display_name]
+                            [ text <| " "++(Common.accountDisplayName <| account) ]
                         , text " boosted"
                         ]
                     , Lazy.lazy3 statusView context reblog clickOpen