diff --git a/src/App.vue b/src/App.vue
index 32773a7..22cd861 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -36,16 +36,11 @@ export default defineComponent({
   data() {
     return {
       appVersion: packageInfo.version,
-      needRefreshTest: false
     };
   },
 
   created() {
     document.title = `GeneraTOR ${this.appVersion}`;
-
-    setTimeout(() => {
-      this.needRefreshTest = true;
-    }, 500);
   }
 });
 </script>
diff --git a/src/components/Order.vue b/src/components/Order.vue
index 825b95b..16568a9 100644
--- a/src/components/Order.vue
+++ b/src/components/Order.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="order dark">
+  <div class="order" :class="{ dark: store.orderDarkMode }">
     <div class="order_content">
       <transition name="order-anim" mode="out-in">
         <keep-alive>
diff --git a/src/components/OrderMessage.vue b/src/components/OrderMessage.vue
index b126905..56bb5a3 100644
--- a/src/components/OrderMessage.vue
+++ b/src/components/OrderMessage.vue
@@ -24,6 +24,17 @@
     </div>
 
     <div class="message_checkboxes">
+      <label for="dark-mode" class="g-checkbox">
+        <input
+          type="checkbox"
+          name="dark-mode"
+          id="dark-mode"
+          v-model="store.orderDarkMode"
+          @change="onCheckboxChange"
+        />
+        <span>Ciemny motyw rozkazu</span>
+      </label>
+
       <label for="copy-increment" class="g-checkbox">
         <input
           type="checkbox"
@@ -34,6 +45,7 @@
         />
         <span>Aktualizuj numer rozkazu po skopiowaniu</span>
       </label>
+      
       <label for="save-increment" class="g-checkbox">
         <input
           type="checkbox"
@@ -44,6 +56,7 @@
         />
         <span>Aktualizuj numer rozkazu po zapisaniu</span>
       </label>
+
       <label for="update-date" class="g-checkbox">
         <input
           type="checkbox"
@@ -98,6 +111,8 @@ export default defineComponent({
     this.incrementOnSave = this.getOrderSetting('save-increment') === 'true';
     this.incrementOnCopy = this.getOrderSetting('copy-increment') === 'true';
     this.updateDate = this.getOrderSetting('update-date') === 'true';
+    
+    this.store.orderDarkMode = this.getOrderSetting('dark-mode') === 'true';
   },
 
   computed: {
@@ -239,7 +254,7 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
-@import "../styles/global.scss";
+@import '../styles/global.scss';
 
 .order-message {
   h3 {
@@ -256,7 +271,7 @@ export default defineComponent({
 .message_body {
   height: 250px;
   overflow: auto;
-  
+
   background-color: $bgColLighter;
   color: white;
   text-align: justify;
@@ -292,6 +307,8 @@ export default defineComponent({
 }
 
 .message_checkboxes {
+  display: flex;
+  flex-direction: column;
   margin-top: 1em;
 }
 
diff --git a/src/components/OrderTrainPicker.vue b/src/components/OrderTrainPicker.vue
index e2d2968..221330f 100644
--- a/src/components/OrderTrainPicker.vue
+++ b/src/components/OrderTrainPicker.vue
@@ -2,28 +2,21 @@
   <div class="order-train-picker">
     <div class="options">
       <label for="dispatcher-select">
-        <select name="dispatcher-select" id="dispatcher-select" v-model="selectedDispatcherName">
-          <option :value="null" disabled>Nick dyżurnego</option>
-          <option
-            v-for="dispatcherName in dispatcherNameList"
-            :value="dispatcherName"
-            :key="dispatcherName"
-          >
-            {{ dispatcherName }}
-          </option>
-        </select>
-      </label>
-
-      <label for="scenery-select">
         <select
-          name="scenery-select"
-          id="scenery-select"
-          v-model="selectedSceneryName"
-          :disabled="!sceneryNameList || sceneryNameList.length == 0"
+          name="dispatcher-select"
+          id="dispatcher-select"
+          v-model="selectedSceneryId"
+          @change="selectSceneryOption"
         >
           <option :value="null" disabled>Sceneria</option>
-          <option :value="sceneryName" v-for="sceneryName in sceneryNameList" :key="sceneryName">
-            {{ sceneryName }}
+          <option
+            v-for="scenery in filteredSceneries"
+            :value="`${scenery.stationName}|${scenery.stationHash}|${scenery.dispatcherName}|${scenery.region}`"
+            :key="scenery.dispatcherName + scenery.stationName"
+          >
+            {{ scenery.stationName }} &bull; {{ scenery.dispatcherName }} [{{
+              getRegionNameById(scenery.region)
+            }}]
           </option>
         </select>
       </label>
@@ -33,7 +26,7 @@
           name="checkpoint-select"
           id="checkpoint-select"
           v-model="selectedCheckpointName"
-          :disabled="!sceneryNameList || sceneryNameList.length == 0"
+          :disabled="!selectedScenery"
         >
           <option :value="null" disabled>Posterunek</option>
           <option :value="cp" v-for="cp in checkpointNameList" :key="cp">
@@ -49,47 +42,47 @@
           id="fill-checkpoint"
           v-model="fillCheckpointName"
         />
-        <span> Uzupełniaj skrót post.</span>
+        <span> Uzupełniaj skrót wybranego posterunku</span>
       </label>
     </div>
 
     <div class="content">
-      <b v-if="!selectedSceneryName" class="text--accent">
+      <b v-if="!selectedSceneryId" class="text--accent">
         Wybierz dyżurnego oraz scenerię, aby zobaczyć pociągi
       </b>
 
       <div v-else>
-        <b class="text--accent">Kliknij na gracza, aby wypełnić obecny rozkaz jego danymi</b>
+        <div style="margin-bottom: 0.5em">
+          <h3 style="margin-bottom: 0.5em">Aktywne RJ i gracze na scenerii</h3>
+          <b class="text--accent">Kliknij na gracza, aby wypełnić obecny rozkaz jego danymi</b>
+        </div>
 
-        <p>Gracze online bez RJ</p>
         <ul class="train-list">
           <li
             v-for="train in sceneryTrains"
             :key="train.trainNo + train.driverName"
             @click="fillOrder(train.trainNo)"
           >
-            <b>{{ train.trainNo }} | {{ train.driverName }}</b>
+            <button class="g-button">
+              <span
+                v-if="train.currentStationName == selectedScenery?.stationName"
+                class="online-indicator"
+              ></span>
+
+              <b>
+                {{ train.driverName }} &bull;
+                <span v-if="train.timetable" style="color: gold">{{
+                  train.timetable.category
+                }}</span>
+                {{ train.trainNo }}
+              </b>
+            </button>
           </li>
 
-          <li class="no-trains" v-if="sceneryTrains?.length == 0 && selectedSceneryName">
+          <li class="no-trains" v-if="sceneryTrains?.length == 0 && selectedSceneryId">
             Brak graczy
           </li>
         </ul>
-
-        <p>Aktywne rozkłady jazdy</p>
-        <ul class="train-list">
-          <li
-            v-for="train in sceneryScheduledTrains"
-            :key="train.trainNo + train.driverName"
-            @click="fillOrder(train.trainNo)"
-          >
-            <b>{{ train.trainNo }} | {{ train.driverName }}</b>
-          </li>
-
-          <li class="no-trains" v-if="sceneryScheduledTrains?.length == 0">
-            Brak aktywnych rozkładów
-          </li>
-        </ul>
       </div>
     </div>
   </div>
@@ -106,6 +99,7 @@ import {
 import http from '../http';
 import { ISceneryData } from '../types/dataTypes';
 import { API } from '../types/apiTypes';
+import { getRegionNameById } from '../utils/sceneryUtils';
 
 export default defineComponent({
   name: 'order-train-picker',
@@ -115,8 +109,7 @@ export default defineComponent({
       sceneriesData: undefined as ISceneryData[] | undefined,
       activeData: undefined as API.ActiveData.Response | undefined,
 
-      selectedSceneryName: null as string | null,
-      selectedDispatcherName: null as string | null,
+      selectedSceneryId: null as string | null,
       selectedCheckpointName: null as string | null,
 
       fillCheckpointName: false,
@@ -137,7 +130,7 @@ export default defineComponent({
 
     this.refreshInterval = window.setInterval(() => {
       this.fetchActiveData();
-    }, 35 * 1000);
+    }, 25 * 1000);
   },
 
   deactivated() {
@@ -145,82 +138,64 @@ export default defineComponent({
   },
 
   watch: {
-    selectedDispatcherName() {
-      if (!this.sceneryNameList) return null;
-
-      this.selectedSceneryName = this.sceneryNameList.length == 0 ? null : this.sceneryNameList[0];
-    },
-
-    selectedSceneryName() {
-      this.selectedCheckpointName =
-        this.checkpointNameList.length == 0 ? null : this.checkpointNameList[0];
-    },
-
     fillCheckpointName(val: boolean) {
       window.localStorage.setItem('fill-checkpoint', `${val}`);
     }
   },
 
   computed: {
-    selectedSceneryHash() {
+    selectedScenery() {
       return this.activeData?.activeSceneries?.find(
-        (s) => this.selectedSceneryName == s.stationName
-      )?.stationHash;
-    },
-
-    sceneriesOnlinePL1() {
-      return this.activeData?.activeSceneries?.filter((s) => s.region == 'eu' && s.isOnline);
-    },
-
-    dispatcherNameList() {
-      return [...new Set(this.sceneriesOnlinePL1?.map((s) => s.dispatcherName))].sort((a, b) =>
-        a.toLocaleLowerCase() < b.toLocaleLowerCase() ? -1 : 1
+        (scenery) =>
+          this.selectedSceneryId ==
+          `${scenery.stationName}|${scenery.stationHash}|${scenery.dispatcherName}|${scenery.region}`
       );
     },
 
-    sceneryNameList() {
-      if (!this.sceneriesOnlinePL1) return [];
-
-      return this.sceneriesOnlinePL1
-        .filter((s) => s.dispatcherName == this.selectedDispatcherName)
-        .map((s) => s.stationName)
-        .sort((a, b) => (a < b ? -1 : 1));
+    filteredSceneries() {
+      return this.activeData?.activeSceneries
+        ?.filter((s) => s.isOnline)
+        .sort((s1, s2) => s1.stationName.localeCompare(s2.stationName));
     },
 
     checkpointNameList() {
-      if (!this.selectedSceneryName) return [];
+      if (!this.selectedScenery) return [];
 
-      const name = this.selectedSceneryName;
-      const checkpoints = this.sceneriesData?.find(
-        (s) => s.name.toLocaleLowerCase() == name.toLocaleLowerCase()
-      )?.checkpoints;
+      const checkpoints =
+        this.sceneriesData?.find((s) => s.name == this.selectedScenery?.stationName)?.checkpoints ??
+        '';
 
-      if (!checkpoints || checkpoints.length == 0) return [name];
+      if (checkpoints.length == 0) return [this.selectedScenery.stationName];
 
       return checkpoints.split(';');
     },
 
     sceneryTrains() {
-      return this.activeData?.trains?.filter(
-        (t) =>
-          t.online &&
-          t.currentStationName == this.selectedSceneryName &&
-          this.selectedSceneryName &&
-          !t.timetable
-      );
-    },
+      if (!this.selectedScenery || !this.activeData?.trains) return [];
 
-    sceneryScheduledTrains() {
-      if (!this.selectedSceneryHash) return [];
-      const hash = this.selectedSceneryHash;
+      const scenery = this.selectedScenery;
 
-      return this.activeData?.trains
-        ?.filter((t) => t.timetable?.sceneries.includes(hash))
-        .sort((t1, t2) => t1.trainNo - t2.trainNo);
+      return this.activeData.trains
+        ?.filter(
+          (t) =>
+            (t.currentStationName == scenery.stationName &&
+              t.region == scenery.region &&
+              (t.online || t.lastSeen < Date.now() - 60000)) ||
+            t.timetable?.path.includes(`${scenery.stationName} ${scenery.stationHash}.sc`)
+        )
+        .sort((t1, t2) => {
+          return (
+            (t2.currentStationName == scenery.stationName ? 1 : -1) -
+              (t1.currentStationName == scenery.stationName ? 1 : -1) ||
+            t1.driverName.localeCompare(t2.driverName)
+          );
+        });
     }
   },
 
   methods: {
+    getRegionNameById,
+
     async fetchSceneriesData() {
       const data: ISceneryData[] = (await http.get<ISceneryData[]>('api/getSceneries')).data;
 
@@ -233,22 +208,27 @@ export default defineComponent({
       this.activeData = data;
     },
 
+    selectSceneryOption() {
+      this.selectedCheckpointName =
+        this.checkpointNameList.length == 0 ? null : this.checkpointNameList[0];
+    },
+
     fillOrder(trainNo: number) {
-      if (!this.selectedDispatcherName || !this.selectedSceneryName) return;
+      if (!this.selectedScenery) return;
 
       const chosenOrder = this.store[this.store.chosenOrderType];
       chosenOrder.header.trainNo = trainNo.toString();
       chosenOrder.header.date = currentFormattedDate();
 
-      this.store.orderFooter.dispatcherName = this.selectedDispatcherName;
+      this.store.orderFooter.dispatcherName = this.selectedScenery.stationName;
       this.store.orderFooter.stationName =
-        this.selectedCheckpointName?.split(',')[0] || this.selectedSceneryName;
+        this.selectedCheckpointName?.split(',')[0] || this.selectedScenery.stationName;
       this.store.orderFooter.hour = currentFormattedHours();
       this.store.orderFooter.minutes = currentFormattedMinutes();
 
       if (this.fillCheckpointName) {
         const sceneryAbbrev = this.sceneriesData?.find(
-          ({ name }) => name === this.selectedSceneryName
+          ({ name }) => name === this.selectedSceneryId
         )?.abbr;
         this.store.orderFooter.checkpointName =
           sceneryAbbrev || this.store.orderFooter.stationName.slice(0, 2);
@@ -264,27 +244,22 @@ export default defineComponent({
 @import '../styles/global.scss';
 
 .order-train-picker {
-  height: 90vh;
-
-  overflow-y: auto;
-
   display: flex;
   flex-direction: column;
   align-items: center;
+  overflow: auto;
+  padding: 0 0.5em;
 }
 
 .options {
   display: flex;
-  width: 100%;
-  justify-content: center;
-  gap: 1em;
   flex-wrap: wrap;
+  width: 100%;
+  gap: 0.5em;
 
   label {
-    width: 45%;
-
-    display: flex;
-    align-items: center;
+    width: 100%;
+    text-align: center;
   }
 
   select {
@@ -293,8 +268,6 @@ export default defineComponent({
     font-size: 1em;
     width: 100%;
 
-
-
     &[disabled] {
       color: gray;
     }
@@ -305,27 +278,41 @@ export default defineComponent({
   margin-top: 1em;
   width: 100%;
   text-align: center;
-
-  p {
-    margin: 1em 0;
-    font-weight: bold;
-    font-size: 1.1em;
-  }
 }
 
 ul.train-list {
-  li {
+  padding: 1px;
+
+  li.no-trains {
+    font-weight: bold;
+    background-color: $bgColDarker;
+    padding: 0.5em;
+    margin-top: 0.5em;
+  }
+
+  li > button {
+    width: 100%;
     background-color: $bgColDarker;
     padding: 0.5em;
     margin-top: 0.5em;
 
-    cursor: pointer;
+    &:hover {
+      background-color: $bgColLighter;
+    }
 
-    &.no-trains {
-      font-weight: bold;
-
-      cursor: default;
+    &:focus-visible {
+      outline: 1px solid $accentCol;
     }
   }
 }
+
+.online-indicator {
+  display: inline-block;
+  width: 9px;
+  height: 9px;
+  vertical-align: middle;
+  background-color: greenyellow;
+  border-radius: 100%;
+  margin: 0 5px;
+}
 </style>
diff --git a/src/store/store.ts b/src/store/store.ts
index cbe3841..cdbf74c 100644
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -10,6 +10,7 @@ export const useStore = defineStore('store', {
   state: () => {
     return {
       helperModalOpen: false,
+      orderDarkMode: false,
 
       chosenOrderType: 'orderN' as TOrder,
       chosenLocalOrderId: '',
diff --git a/src/styles/global.scss b/src/styles/global.scss
index ec48564..dc0b793 100644
--- a/src/styles/global.scss
+++ b/src/styles/global.scss
@@ -194,17 +194,18 @@ label.g-checkbox {
   cursor: pointer;
   color: #aaa;
 
+  user-select: none;
+  -moz-user-select: none;
+
   span {
     transition: color 125ms ease;
   }
 
   span::before {
-    content: '';
+    content: '\2717';
     display: inline-block;
-    width: 1ch;
-    height: 1ch;
 
-    background-color: #aaa;
+    // background-color: #aaa;
     border-radius: 50%;
     margin-right: 0.25em;
 
@@ -223,7 +224,8 @@ label.g-checkbox {
       color: greenyellow;
 
       &::before {
-        background-color: greenyellow;
+        content: '\2713';
+        // background-color: greenyellow;
       }
     }
   }
diff --git a/src/types/apiTypes.ts b/src/types/apiTypes.ts
index 6842e63..70f13e1 100644
--- a/src/types/apiTypes.ts
+++ b/src/types/apiTypes.ts
@@ -100,6 +100,7 @@ export declare module API {
       TWR: boolean;
       SKR: boolean;
       sceneries: string[];
+      path: string;
     }
   }
 }
diff --git a/src/utils/sceneryUtils.ts b/src/utils/sceneryUtils.ts
new file mode 100644
index 0000000..15ce848
--- /dev/null
+++ b/src/utils/sceneryUtils.ts
@@ -0,0 +1,21 @@
+export const getRegionNameById = (id: string) => {
+  switch (id) {
+    case 'eu':
+      return 'PL1';
+
+    case 'cae':
+      return 'PL2';
+
+    case 'us':
+      return 'CZE';
+
+    case 'usw':
+      return 'DE';
+
+    case 'ru':
+      return 'ENG';
+
+    default:
+      return 'PL1';
+  }
+};
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 972bf3a..11f195b 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -132,13 +132,14 @@ export default defineComponent({
   }
 
   .message_container {
-    width: 500px;
+    width: 100%;
+    max-width: 500px;
 
     display: grid;
     grid-template-rows: auto 1fr;
-    overflow: hidden;
 
     height: 95vh;
+    overflow: auto;
   }
 
   .message_nav {