diff --git a/assets/style/timeline-content.scss b/assets/style/timeline-content.scss
index d3413907..d4b7c4fb 100644
--- a/assets/style/timeline-content.scss
+++ b/assets/style/timeline-content.scss
@@ -1,5 +1,5 @@
 .timeline {
-  .post {
+  .timeline-record {
     .user{
       margin-top: 4px;
 
diff --git a/assets/style/timeline.scss b/assets/style/timeline.scss
index a741d475..75e03de7 100644
--- a/assets/style/timeline.scss
+++ b/assets/style/timeline.scss
@@ -16,7 +16,7 @@
   }
 }
 
-.post{
+.timeline-record{
   position: relative;
   display: flex;
 
@@ -124,7 +124,7 @@
       padding: 0;
     }
 
-    .post {
+    .timeline-record {
       position: relative;
       display: flex;
 
diff --git a/client/ui/timeline.js b/client/ui/timeline.js
index 6ff12ca3..a0fa2bdf 100644
--- a/client/ui/timeline.js
+++ b/client/ui/timeline.js
@@ -39,20 +39,25 @@ module.exports = function(app) {
                 }
             },
             controller: function($scope, api){
+                $scope.recordClass = function (i) {
+                    return i['type'];
+                };
+
                 api.news.feed()
                     .success(function (list) {
                         var feed = list.map(function (post) {
                             if(post.type == "instagram"){
-                                var author_id = personByInstagram(team.team, post.data.user.username);
-                                var name = author_id ? team.short(author_id) : post.data.user.username;
+                                var author_id = personByInstagram(team.team, post.data.author);
+                                var name = author_id ? team.short(author_id) : post.data.author;
 
                                 return {
-                                    date: post.publishDate,
-                                    image: post.data.images.standard_resolution.url,
-                                    url: post.data.link,
+                                    date: post.date,
+                                    image: post.data.image.standard_resolution.url,
+                                    url: post.data.url,
                                     username: name,
-                                    userpic: post.data.user.profile_picture,
-                                    text: postText(post),
+                                    //userpic: post.data.user.profile_picture,
+                                    text: post.body,
+                                    //text: postText(post),
                                     type: post.type
                                 };
                             }else{
diff --git a/templates/views/timeline-post.html b/templates/views/timeline-post.html
index 4d09752f..bab9c0ae 100644
--- a/templates/views/timeline-post.html
+++ b/templates/views/timeline-post.html
@@ -1,6 +1,9 @@
 <div class="head">
     <a name="{{post.uri}}"></a>
-    <p class="date"><a href="#{{post.uri}}">{{post.date | date : "dd.MM.yyyy"}}</a></p>
+
 </div>
 
-<div class="body" ng-bind-html="message"></div>
\ No newline at end of file
+<div class="body">
+    <div><p class="date"><a href="#{{post.uri}}">{{post.date | date : "dd.MM.yyyy"}}</a></p></div>
+    <div class="message" ng-bind-html="message"></div>
+</div>
\ No newline at end of file
diff --git a/templates/views/timeline.html b/templates/views/timeline.html
index 2c8d73a8..aefe83b5 100644
--- a/templates/views/timeline.html
+++ b/templates/views/timeline.html
@@ -1,5 +1,5 @@
 <div class="timeline">
-    <timeline-record class="post"
+    <timeline-record class="timeline-record {{recordClass(post)}}"
                      content="post"
                      ng-repeat="post in feed"
                      ng-class="{left: isEven($index), right: !isEven($index)}">