diff --git a/saoriview.cpp b/saoriview.cpp
index 76a0199..f09164b 100644
--- a/saoriview.cpp
+++ b/saoriview.cpp
@@ -104,18 +104,18 @@
     auto i = SaoriApplication::findInstance(QUrl(instance));
     if (!i) return QString();
     QString result;
-    result = (tr("<div>%1</div>"
-                 "<div>%2</div>"
-                 "<div>%3</div>"
-                 "<div>email : %4</div>"
-                 "<div>%5</div>"
-                 "<div>version : %6</div>"
-                 ).arg(i->instanceInfo("title").toString(),
-                       i->instanceInfo("uri").toString(),
-                       i->instanceInfo("description").toString(),
-                       i->instanceInfo("email").toString(),
-                       accountParser(i->instanceInfo("contact_account").toObject()),
-                       i->instanceInfo("version").toString()));
+    result = QString(htmlDiv("instance_title","%1") +
+                     htmlDiv("instance_uri","%2") +
+                     htmlDiv("instance_description","%3") +
+                     htmlDiv("instance_email","email : %4") +
+                     htmlDiv("instance_contact_account","%5") +
+                     htmlDiv("instance_version","Version : %6")
+                    ).arg(i->instanceInfo("title").toString(),
+                          i->instanceInfo("uri").toString(),
+                          i->instanceInfo("description").toString(),
+                          i->instanceInfo("email").toString(),
+                          accountParser(i->instanceInfo("contact_account").toObject()),
+                          i->instanceInfo("version").toString());
     return result;
 }
 
@@ -123,39 +123,28 @@
 {
     QString result;
     if (json.isEmpty()) return QString();
-    bool rebloged = false;
-    if (!json["reblog"].isNull()) rebloged = true;
-    if (rebloged) {
-        result += statusParser(json["reblog"].toObject());
-        result += "<div class=\"reblogger\">";
-    } else {
-        result += "<div class=\"status\">";
-    }
-    if (rebloged) {
-        result += "<br /><img(mavatar:";
-        result += json["account"].toObject()["avatar"].toString();
-        result += ") />";
-        result += tr("boosted by: %1").arg(json["account"].toObject()["display_name"].toString());
-    } else {
-        result += accountParser(json["account"].toObject());
-        result += "<div class=\"created_at\">";
-        result += tr("created at :");
-        QDateTime dt = QDateTime::fromString(json["created_at"].toString(),"yyyy-MM-ddTHH:mm:ss.zzzZ");
-        dt.setTimeSpec(Qt::UTC);
-        result += dt.toLocalTime().toString();
-        result += "</div>";
-    }
-    if (!rebloged) {
-        result += "<div class=\"content\">";
-        result += contentParser(json["content"].toString());
-        result += "<div class=\"media\">";
+
+    QDateTime dt = QDateTime::fromString(json["created_at"].toString(),"yyyy-MM-ddTHH:mm:ss.zzzZ");
+    dt.setTimeSpec(Qt::UTC);
+
+    result = (!json["reblog"].isNull()) ?
+        (statusParser(json["reblog"].toObject()) +
+                htmlDiv("reblogger",htmlHr() +
+                        htmlImg("mavatar",json["account"].toObject()["avatar"].toString()) +
+                        tr("boosted by: %1").arg(json["account"].toObject()["display_name"].toString()))
+        ) :
+        (htmlDiv("status",accountParser(json["account"].toObject()) +
+                htmlDiv("created_at",tr("created at :") +
+                        dt.toLocalTime().toString()) +
+                htmlDiv("content",contentParser(json["content"].toString())))
+        );
+    if (json["reblog"].isNull()) {
+        QString media;
         for (auto j:json["media_attachments"].toArray()) {
-            result += mediaParser(j.toObject());
+            media += mediaParser(j.toObject());
         }
-        result += "</div>";
-        result += "</div>";
+        result += htmlDiv("media",media);
     }
-    result += "</div>";
     return result;
 }
 
@@ -183,19 +172,10 @@
 const QString SaoriView::mediaParser(const QJsonObject json)
 {
     QString result;
-    result += "<span class=\"media_preview\">";
-    if (json["type"].toString() == "image") {
-        result += "<a href=\"media:";
-        result += json["url"].toString();
-        result += "\">";
-    }
-    result += "<img(media:";
-    result += json["preview_url"].toString();
-    result += ")>";
-    if (json["type"].toString() == "image") {
-        result += "</a>";
-    }
-    result += "</span>";
+    result = htmlSpan("media_preview",
+                      json["type"].toString() == "image" ?
+                        htmlAnc("media:" + json["url"].toString(),htmlImg("media",json["preview_url"].toString())) :
+                        htmlImg("media",json["preview_url"].toString()));
     return result;
 }
 
@@ -234,47 +214,42 @@
 {
     QString result;
     if (json.isEmpty()) return QString();
-    result += "<div class=\"notification\">";
+
+    QDateTime dt = QDateTime::fromString(json["created_at"].toString(),"yyyy-MM-ddTHH:mm:ss.zzzZ");
+    dt.setTimeSpec(Qt::UTC);
+
     QStringList type;
     type << "mention" << "reblog" << "favourite" << "follow";
-    result += "<div class=\"notification_type\">";
+    QString title;
     switch (type.indexOf(json["type"].toString())) {
     case 0:
-        result += "<img(mavatar::/icons/ionicons/chatbubbles.svg) />";
-        result += tr("%1 mentioned your status.").arg(json["account"].toObject()["display_name"].toString());
+        title += htmlImg("mavatar",":/icons/ionicons/chatbubbles.svg");
+        title += tr("%1 mentioned your status.").arg(json["account"].toObject()["display_name"].toString());
         break;
     case 1:
-        result += "<img(mavatar::/icons/ionicons/share.svg) />";
-        result += tr("%1 boosted your status.").arg(json["account"].toObject()["display_name"].toString());
+        title += htmlImg("mavatar",":/icons/ionicons/share.svg");
+        title += tr("%1 boosted your status.").arg(json["account"].toObject()["display_name"].toString());
         break;
     case 2:
-        result += "<img(mavatar::/icons/ionicons/heart.svg) />";
-        result += tr("%1 favourited your status.").arg(json["account"].toObject()["display_name"].toString());
+        title += htmlImg("mavatar",":/icons/ionicons/heart.svg");
+        title += tr("%1 favourited your status.").arg(json["account"].toObject()["display_name"].toString());
         break;
     case 3:
-        result += "<img(mavatar::/icons/ionicons/person-add.svg) />";
-        result += tr("%1 followed you.").arg(json["account"].toObject()["display_name"].toString());
+        title += htmlImg("mavatar",":/icons/ionicons/person-add.svg");
+        title += tr("%1 followed you.").arg(json["account"].toObject()["display_name"].toString());
         break;
     default:
         break;
     }
-    result += "<hr /></div>";
-    result += "<div class=\"created_at\">";
-    result += tr("created at :");
-    QDateTime dt = QDateTime::fromString(json["created_at"].toString(),"yyyy-MM-ddTHH:mm:ss.zzzZ");
-    dt.setTimeSpec(Qt::UTC);
-    result += dt.toLocalTime().toString();
-    result += "</div>";
 
-    result += statusParser(json["status"].toObject());
-
-    result += "<div class=\"reblogger\">";
-    result += "<br /><img(mavatar:";
-    result += json["account"].toObject()["avatar"].toString();
-    result += ") />";
-    result += tr("%1").arg(json["account"].toObject()["display_name"].toString());
-    result += "</div>";
-    result += "</div>";
+    result = htmlDiv("notification",
+                     htmlDiv("notification_type",title + htmlHr()) +
+                     htmlDiv("created_at",tr("created at :") + dt.toLocalTime().toString()) +
+                     statusParser(json["status"].toObject()) +
+                     htmlDiv("reblogger",htmlHr() +
+                             htmlImg("mavatar",json["account"].toObject()["avatar"].toString()) +
+                             tr("%1 (@%2)").arg(json["account"].toObject()["display_name"].toString(),
+                                              json["account"].toObject()["acct"].toString())));
     return result;
 }
 
@@ -290,7 +265,7 @@
 
 const QString SaoriView::htmlImg(const QString type, const QString url)
 {
-    return QString("<img(%1:%2\) />").arg(type,url);
+    return QString("<img(%1:%2) />").arg(type,url);
 }
 
 const QString SaoriView::htmlAnc(const QString link, const QString text)