diff --git a/packages/frontend/src/components/GlobalsBuilder.vue b/packages/frontend/src/components/GlobalsBuilder.vue
index a865bcd26..ee67fca45 100644
--- a/packages/frontend/src/components/GlobalsBuilder.vue
+++ b/packages/frontend/src/components/GlobalsBuilder.vue
@@ -1,17 +1,23 @@
 <template>
-  <v-card rounded="lg" class="pa-4 mb-4" elevation="0">
-    <v-row justify="end">
+  <v-card rounded="lg" class="py-4 px-0 mb-4" elevation="0">
+    <v-card-actions>
+      <v-spacer />
       <v-btn color="primary" small @click="resetGlobals">reset globals</v-btn>
-    </v-row>
-    <globals-entry
-      v-if="!$apollo.loading"
-      :entries="globalsArray"
-      :path="[]"
-      @add-prop="addProp"
-      @remove-prop="removeProp"
-      @field-to-object="fieldToObject"
-      @object-to-field="objectToField"
-    />
+    </v-card-actions>
+    <v-card-text>
+      <globals-entry
+        v-if="!$apollo.loading"
+        :entries="globalsArray"
+        :path="[]"
+        @add-prop="addProp"
+        @remove-prop="removeProp"
+        @field-to-object="fieldToObject"
+        @object-to-field="objectToField"
+      />
+      <div v-else>
+        <v-skeleton-loader type="list-item-three-line" />
+      </div>
+    </v-card-text>
   </v-card>
 </template>
 
@@ -32,8 +38,9 @@ export default {
           id: this.commitId
         }
       },
-      update: (data) => {
+      update(data) {
         delete data.stream.object.data.__closure
+        this.globalsArray = this.nestedGlobals(data.stream.object.data)
         return data.stream.object
       }
     }
@@ -57,7 +64,7 @@ export default {
   computed: {},
   mounted() {
     //?: how to run this only once but after apollo query is finished loading
-    this.globalsArray = this.nestedGlobals(this.object.data)
+    // this.globalsArray = this.nestedGlobals(this.object.data)
   },
   methods: {
     nestedGlobals(data) {
diff --git a/packages/frontend/src/views/Globals.vue b/packages/frontend/src/views/Globals.vue
index fc34081e9..c36e071d1 100644
--- a/packages/frontend/src/views/Globals.vue
+++ b/packages/frontend/src/views/Globals.vue
@@ -1,21 +1,30 @@
 <template>
   <v-container>
-    <h1>wow globals</h1>
-    <v-row>
-      <v-col>
-        <globals-builder v-if="stream" :stream-id="streamId" :commit-id="commitId" />
-      </v-col>
-    </v-row>
+    <div v-if="!commitId && !$apollo.loading">
+      <h1>Empty State</h1>
+      <p>TODO: Help, there's no globals branch and/or no commits on it!</p>
+    </div>
+    <div v-else>
+      <h1>wow globals</h1>
+      <v-row>
+        <v-col>
+          <globals-builder v-if="stream" :stream-id="streamId" :commit-id="commitId" />
+        </v-col>
+      </v-row>
+      <h1>History</h1>
+      <p>TODO</p>
+    </div>
   </v-container>
 </template>
 
 <script>
 import branchQuery from '../graphql/branch.gql'
+import GlobalsBuilder from '../components/GlobalsBuilder'
 
 export default {
   name: 'Globals',
   components: {
-    GlobalsBuilder: () => import('../components/GlobalsBuilder')
+    GlobalsBuilder
   },
   apollo: {
     stream: {
@@ -33,7 +42,7 @@ export default {
       return this.$route.params.streamId
     },
     commitId() {
-      return this.stream.branch.commits.items[0].referencedObject
+      return this.stream?.branch?.commits?.items[0].referencedObject
     }
   }
 }