diff --git a/src/components/TrainsView/TrainInfoSimple.vue b/src/components/TrainsView/TrainInfoSimple.vue
index 40fd150..267e6f0 100644
--- a/src/components/TrainsView/TrainInfoSimple.vue
+++ b/src/components/TrainsView/TrainInfoSimple.vue
@@ -3,6 +3,12 @@
     <section>
       <span>
         <div>
+          <span class="timetable_warnings">
+            <span class="warning twr" v-if="train.timetableData?.TWR">TWR</span>
+
+            <span class="warning skr" v-if="train.timetableData?.SKR">SKR</span>
+          </span>
+
           <strong v-if="train.timetableData">{{ train.timetableData.category }}&nbsp;</strong>
           <strong>{{ train.trainNo }}</strong>
           <span>&nbsp;| {{ train.driverName }}</span>
@@ -143,6 +149,27 @@ export default defineComponent({
 .timetable_route {
   display: flex;
   align-items: center;
+
+  margin-top: 0.5em;
+}
+
+.timetable_warnings {
+  color: black;
+
+  .warning {
+    padding: 0.1em 0.5em;
+    margin-right: 0.2em;
+
+    font-weight: bold;
+
+    &.twr {
+      background: var(--clr-twr);
+    }
+
+    &.skr {
+      background: var(--clr-skr);
+    }
+  }
 }
 
 .comments {
diff --git a/src/components/TrainsView/TrainOptions.vue b/src/components/TrainsView/TrainOptions.vue
index 1b642dc..400b917 100644
--- a/src/components/TrainsView/TrainOptions.vue
+++ b/src/components/TrainsView/TrainOptions.vue
@@ -26,30 +26,6 @@
         </div>
       </div>
     </div>
-
-    <!-- <div class="options_wrapper">
-      <select-box
-        :title="$t('trains.option-distance')"
-        :itemList="translatedSorterOptions"
-        :defaultItemIndex="0"
-        :prefix="$t('trains.sorter-prefix')"
-        @selected="changeSorter"
-      />
-    </div>
-
-    <div class="options_wrapper">
-      <div class="search-box">
-        <input class="search-input" v-model="searchedTrain" :placeholder="$t('trains.search-train')" />
-
-        <img class="search-exit" :src="exitIcon" alt="exit-icon" @click="() => (searchedTrain = '')" />
-      </div>
-
-      <div class="search-box">
-        <input class="search-input" v-model="searchedDriver" :placeholder="$t('trains.search-driver')" />
-
-        <img class="search-exit" :src="exitIcon" alt="exit-icon" @click="() => (searchedDriver = '')" />
-      </div>
-    </div> -->
   </div>
 </template>