diff --git a/src/components/OrderTrainPicker.vue b/src/components/OrderTrainPicker.vue
index b96d9d6..1c74232 100644
--- a/src/components/OrderTrainPicker.vue
+++ b/src/components/OrderTrainPicker.vue
@@ -1,24 +1,47 @@
 <template>
   <div class="order-train-picker">
     <div class="options">
-      <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">
-          {{ dispatcherName }}
-        </option>
-      </select>
+      <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">
+            {{ dispatcherName }}
+          </option>
+        </select>
+      </label>
 
-      <select
-        name="scenery-select"
-        id="scenery-select"
-        v-model="selectedSceneryName"
-        :disabled="sceneryNameList.length == 0"
-      >
-        <option :value="null" disabled>Sceneria</option>
-        <option :value="sceneryName" v-for="sceneryName in sceneryNameList">
-          {{ sceneryName }}
-        </option>
-      </select>
+      <label for="scenery-select">
+        <select
+          name="scenery-select"
+          id="scenery-select"
+          v-model="selectedSceneryName"
+          :disabled="sceneryNameList.length == 0"
+        >
+          <option :value="null" disabled>Sceneria</option>
+          <option :value="sceneryName" v-for="sceneryName in sceneryNameList">
+            {{ sceneryName }}
+          </option>
+        </select>
+      </label>
+
+      <label for="checkpoint-select">
+        <select
+          name="checkpoint-select"
+          id="checkpoint-select"
+          v-model="selectedCheckpointName"
+          :disabled="sceneryNameList.length == 0"
+        >
+          <option :value="null" disabled>Posterunek</option>
+          <option :value="cp" v-for="cp in checkpointNameList">
+            {{ cp }}
+          </option>
+        </select>
+      </label>
+
+      <label for="fill-checkpoint">
+        <input type="checkbox" name="fill-checkpoint" id="fill-checkpoint" v-model="fillCheckpointName" />
+        Uzupełniaj skrót post.
+      </label>
     </div>
 
     <div class="content">
@@ -54,7 +77,7 @@ import { defineComponent } from 'vue';
 import axios from 'axios';
 import { ApiSWDR, ApiStacjownik } from '../types/apiTypes';
 import { useStore } from '../store/store';
-import { currentFormattedDate } from '../utils/dateUtils';
+import { currentFormattedDate, currentFormattedHours, currentFormattedMinutes } from '../utils/dateUtils';
 import { ISceneryOnline, ISceneryData } from '../types/dataTypes';
 
 export default defineComponent({
@@ -68,6 +91,9 @@ export default defineComponent({
 
       selectedSceneryName: null as string | null,
       selectedDispatcherName: null as string | null,
+      selectedCheckpointName: null as string | null,
+
+      fillCheckpointName: true,
 
       refreshInterval: -1,
       store: useStore(),
@@ -93,6 +119,7 @@ export default defineComponent({
   watch: {
     selectedDispatcherName() {
       this.selectedSceneryName = this.sceneryNameList.length == 0 ? null : this.sceneryNameList[0];
+      this.selectedCheckpointName = this.checkpointNameList.length == 0 ? null : this.checkpointNameList[0];
     },
   },
 
@@ -118,6 +145,19 @@ export default defineComponent({
         .sort((a, b) => (a < b ? -1 : 1));
     },
 
+    checkpointNameList() {
+      if (!this.selectedSceneryName) return [];
+
+      const name = this.selectedSceneryName;
+      const checkpoints = this.sceneriesData.find(
+        (s) => s.name.toLocaleLowerCase() == name.toLocaleLowerCase()
+      )?.checkpoints;
+
+      if (!checkpoints || checkpoints.length == 0) return [name];
+
+      return checkpoints.split(';');
+    },
+
     sceneryTrains() {
       return this.trainsOnline.filter(
         (t) => t.online && t.currentStationName == this.selectedSceneryName && this.selectedSceneryName && !t.timetable
@@ -176,7 +216,12 @@ export default defineComponent({
       chosenOrder.header.date = currentFormattedDate();
 
       this.store.orderFooter.dispatcherName = this.selectedDispatcherName;
-      this.store.orderFooter.stationName = this.selectedSceneryName;
+      this.store.orderFooter.stationName = this.selectedCheckpointName?.split(',')[0] || this.selectedSceneryName;
+      this.store.orderFooter.hour = currentFormattedHours();
+      this.store.orderFooter.minutes = currentFormattedMinutes();
+
+      if (this.fillCheckpointName)
+        this.store.orderFooter.checkpointName = this.store.orderFooter.stationName.slice(0, 2);
 
       this.store.orderMode = 'OrderMessage';
     },
@@ -203,7 +248,16 @@ export default defineComponent({
 .options {
   display: flex;
   width: 100%;
+  justify-content: center;
   gap: 1em;
+  flex-wrap: wrap;
+
+  label {
+    width: 45%;
+
+    display: flex;
+    align-items: center;
+  }
 
   select {
     border: 2px solid white;
@@ -212,6 +266,10 @@ export default defineComponent({
     width: 100%;
     margin: 0;
     padding: 0.15em;
+
+    &[disabled] {
+      color: gray;
+    }
   }
 
   option {
diff --git a/src/store/store.ts b/src/store/store.ts
index 082e410..47bc620 100644
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia';
 import { IOrderN, IOrderO, IOrderS, TOrder } from '../types/orderTypes';
-import { currentFormattedDate } from '../utils/dateUtils';
+import { currentFormattedDate, currentFormattedHours, currentFormattedMinutes } from '../utils/dateUtils';
 
 export const useStore = defineStore('store', {
   state: () => {
@@ -15,8 +15,8 @@ export const useStore = defineStore('store', {
       orderFooter: {
         stationName: '',
         checkpointName: '',
-        hour: new Date().toLocaleTimeString('pl-PL', { hour: '2-digit' }),
-        minutes: new Date().toLocaleTimeString('pl-PL', { minute: '2-digit' }),
+        hour: currentFormattedHours(),
+        minutes: currentFormattedMinutes(),
         dispatcherName: '',
         secondaryDispatcherName: '',
       },
diff --git a/src/utils/dateUtils.ts b/src/utils/dateUtils.ts
index 949b72a..c00adae 100644
--- a/src/utils/dateUtils.ts
+++ b/src/utils/dateUtils.ts
@@ -1,3 +1,11 @@
 export function currentFormattedDate() {
-    return new Date().toLocaleDateString('pl-PL', { day: 'numeric', month: 'numeric', year: 'numeric' }) + 'r.';
-}
\ No newline at end of file
+  return new Date().toLocaleDateString('pl-PL', { day: 'numeric', month: 'numeric', year: 'numeric' }) + 'r.';
+}
+
+export function currentFormattedMinutes() {
+  return new Date().toLocaleTimeString('pl-PL', { minute: '2-digit' });
+}
+
+export function currentFormattedHours() {
+  return new Date().toLocaleTimeString('pl-PL', { hour: '2-digit' });
+}