diff --git a/packages/frontend/src/views/Streams.vue b/packages/frontend/src/views/Streams.vue
index 433bb516a..ce98b4c90 100644
--- a/packages/frontend/src/views/Streams.vue
+++ b/packages/frontend/src/views/Streams.vue
@@ -16,8 +16,8 @@
       <main-nav-actions :open-new-stream="newStreamDialog" />
 
       <div v-if="user">
-        <v-subheader class="caption">Your stats:</v-subheader>
-        <v-list dense>
+        <v-list dense class="py-0">
+          <v-subheader class="caption ml-2">Your stats:</v-subheader>
           <v-list-item>
             <v-list-item-icon>
               <v-icon small class="">mdi-folder-multiple</v-icon>
@@ -46,8 +46,9 @@
           v-if="userCommits && userCommits.commits.items.length !== 0"
           color="transparent"
           dense
+          class="py-0"
         >
-          <v-subheader class="mt-3 ml-2">Your latest commits:</v-subheader>
+          <v-subheader class="ml-2">Your latest commits:</v-subheader>
           <v-list-item
             v-for="(commit, i) in userCommits.commits.items"
             :key="i"
@@ -84,7 +85,12 @@
       </v-toolbar-title>
       <v-spacer></v-spacer>
       <v-toolbar-items style="margin-right: -18px">
-        <v-btn color="primary" depressed @click="newStreamDialog++" v-if="$vuetify.breakpoint.smAndDown || !streamNav">
+        <v-btn
+          color="primary"
+          depressed
+          @click="newStreamDialog++"
+          v-if="$vuetify.breakpoint.smAndDown || !streamNav"
+        >
           <v-icon>mdi-plus-box</v-icon>
         </v-btn>
       </v-toolbar-items>
@@ -182,7 +188,7 @@ export default {
         query {
           userCommits: user {
             id
-            commits {
+            commits(limit: 7) {
               totalCount
               items {
                 id
diff --git a/packages/frontend/src/views/Timeline.vue b/packages/frontend/src/views/Timeline.vue
index 2cc28170c..4353db416 100644
--- a/packages/frontend/src/views/Timeline.vue
+++ b/packages/frontend/src/views/Timeline.vue
@@ -217,7 +217,7 @@ export default {
       prefetch: true,
       query: gql`
         query {
-          streams {
+          streams (limit: 10) {
             items {
               id
               name
@@ -230,6 +230,7 @@ export default {
   },
   methods: {
     groupSimilarActivities(data) {
+      if(!data) return
       let groupedTimeline = data.user.timeline.items.reduce(function (prev, curr) {
         //first item
         if (!prev.length) {
diff --git a/packages/frontend/src/views/stream/Stream_re_re.vue b/packages/frontend/src/views/stream/Stream_re_re.vue
index 5ba45c8d2..b58b9f4bd 100644
--- a/packages/frontend/src/views/stream/Stream_re_re.vue
+++ b/packages/frontend/src/views/stream/Stream_re_re.vue
@@ -249,9 +249,9 @@
           @click="openShareStreamDialog()"
           v-tooltip="'Share this stream'"
         >
+          <v-icon small class="mr-2 grey--text" v-if="!stream.isPublic">mdi-lock</v-icon>
+          <v-icon small class="mr-2 grey--text" v-else>mdi-lock-open</v-icon>
           <v-icon small class="mr-2">mdi-share-variant</v-icon>
-          <v-icon small class="mr-2 xxxhidden-md-and-down" v-if="!stream.isPublic">mdi-lock</v-icon>
-          <v-icon small class="mr-2 xxxhidden-md-and-down" v-else>mdi-lock-open</v-icon>
           <span class="hidden-md-and-down">Share</span>
         </v-btn>
       </v-toolbar-items>