diff --git a/views/status_label.ejs b/views/status_label.ejs
index be0e9d2..5184c4b 100644
--- a/views/status_label.ejs
+++ b/views/status_label.ejs
@@ -39,8 +39,8 @@ Vue.component('status-label', {
 <script type="text/x-template" id="statusIconTemplate">
   <span class="status" :class="colorClass">
     <i class="icon" :class="icon"></i>
-    <template v-if="['Running', 'Waiting'].includes(status) && progress">
-      <span style="display: inline-block; width: 58px; ">{{ status }}</span>{{ progress.finished }}/{{ progress.total }}
+    <template v-if="['Running', 'Waiting'].includes(status) && progress && progress.total">
+      <span style="text-align: left; display: inline-block; width: 58px; ">{{ status }}</span>{{ progress.finished }}/{{ progress.total }}
     </template>
     <template v-else>
       {{ status }}
diff --git a/views/submissions_item.ejs b/views/submissions_item.ejs
index 8476edc..b5e0cd1 100644
--- a/views/submissions_item.ejs
+++ b/views/submissions_item.ejs
@@ -23,13 +23,12 @@ Vue.component('submission-item', {
   props: ['data', 'config', 'showRejudge', 'progress', 'compiling'],
   computed: {
     statusString() {
-      if (this.compiling) return 'Compiling';
-
       const data = this.data;
 
       if (data.result) {
         return data.result.result;
       } else if (data.running) {
+        if (this.compiling) return 'Compiling';
         return 'Running';
       } else return 'Waiting';
     },