diff --git a/src/App.vue b/src/App.vue
index 3340320..e2485ee 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -41,8 +41,8 @@ git <template>
             <Clock />
             <div class="info_counter">
               <img src="@/assets/icon-dispatcher.svg" alt="icon dispatcher" />
-              <span>{{ data.stationCount }}</span>
-              <span>{{ data.trainCount }}</span>
+              <span>{{ data.activeStationCount }}</span>
+              <span>{{ data.activeTrainCount }}</span>
               <img src="@/assets/icon-train.svg" alt="icon train" />
             </div>
           </span>
@@ -89,14 +89,15 @@ import { Action, Getter } from "vuex-class";
 import UpdateModal from "@/components/Global/UpdateModal.vue";
 import Clock from "@/components/App/Clock.vue";
 
-import StorageManager from "@/scripts/storageManager";
+import StorageManager from "@/scripts/managers/storageManager";
+import { StoreData } from "./scripts/interfaces/StoreData";
 
 @Component({
   components: { Clock, UpdateModal },
 })
 export default class App extends Vue {
   @Action("synchronizeData") synchronizeData;
-  @Getter("getAllData") data;
+  @Getter("getAllData") data!: StoreData;
 
   private VERSION = "1.4.5";
 
diff --git a/src/components/SceneryView/SceneryInfo.vue b/src/components/SceneryView/SceneryInfo.vue
index 2182707..4f9e1ab 100644
--- a/src/components/SceneryView/SceneryInfo.vue
+++ b/src/components/SceneryView/SceneryInfo.vue
@@ -12,11 +12,16 @@
 
         <span v-else>{{ stationInfo.stationName }}</span>
       </div>
-      <div class="scenery-hash">#{{ stationInfo.stationHash }}</div>
+      <div class="scenery-hash" v-if="stationInfo.stationHash">
+        #{{ stationInfo.stationHash }}
+      </div>
     </div>
 
     <section v-if="!timetableOnly">
-      <div class="info-stats">
+      <div
+        class="info-stats"
+        :class="!stationInfo.stationHash ? 'no-stats' : ''"
+      >
         <span class="likes">
           <img :src="likeIcon" alt="icon-like" />
           <span>{{ stationInfo.dispatcherRate }}</span>
@@ -106,7 +111,7 @@
       </div>
 
       <div class="info-dispatcher">
-        <div class="dispatcher">
+        <div class="dispatcher" v-if="stationInfo.stationHash">
           <span
             class="dispatcher_level"
             :style="
@@ -124,12 +129,12 @@
           <span class="dispatcher_name">{{ stationInfo.dispatcherName }}</span>
         </div>
 
-        <span class="status-badge" :class="stationInfo.statusID"
-          >{{ $t(`status.${stationInfo.statusID}`) }}
+        <span class="status-badge" :class="stationInfo.statusID">
+          {{ $t(`status.${stationInfo.statusID}`) }}
           {{
             stationInfo.statusID == "online" ? stationInfo.statusTimeString : ""
-          }}</span
-        >
+          }}
+        </span>
       </div>
 
       <div class="info-lists">
@@ -276,6 +281,10 @@ h3 {
 
     font-size: 1.65em;
 
+    &.no-stats {
+      opacity: 0.5;
+    }
+
     & > span {
       display: flex;
       align-items: center;
diff --git a/src/components/StationsView/FilterCard.vue b/src/components/StationsView/FilterCard.vue
index 6feedfa..1dade14 100644
--- a/src/components/StationsView/FilterCard.vue
+++ b/src/components/StationsView/FilterCard.vue
@@ -75,7 +75,7 @@ import { Vue, Component, Prop } from "vue-property-decorator";
 
 import inputData from "@/data/options.json";
 
-import StorageManager from "@/scripts/storageManager";
+import StorageManager from "@/scripts/managers/storageManager";
 import ActionButton from "../Global/ActionButton.vue";
 
 @Component({ components: { ActionButton } })
diff --git a/src/components/StationsView/StationTable.vue b/src/components/StationsView/StationTable.vue
index 972ee30..c991f8d 100644
--- a/src/components/StationsView/StationTable.vue
+++ b/src/components/StationsView/StationTable.vue
@@ -281,14 +281,9 @@ export default class StationTable extends styleMixin {
 
     if (!station) return;
 
-    if (!station.online) {
-      window.location.href = station.stationURL;
-      return;
-    }
-
     this.$router.push({
       name: "SceneryView",
-      query: { hash: station.stationHash },
+      query: { station: station.stationName.replaceAll(" ", "_") },
     });
   }
 }
diff --git a/src/lang/en.json b/src/lang/en.json
index 4789ee9..9a2acbf 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -118,7 +118,7 @@
     "no-timetables": "No active timetables!",
     "no-users": "NO ACTIVE PLAYERS",
     "no-spawns": "NO OPEN SPAWNS",
-    "no-scenery": "Oops! This scenery doesn't exist or is offline!",
+    "no-scenery": "Oops! This scenery doesn't exist!",
     "return-btn": "Return to main site"
   },
   "timetables": {
diff --git a/src/lang/pl.json b/src/lang/pl.json
index f707404..90fb501 100644
--- a/src/lang/pl.json
+++ b/src/lang/pl.json
@@ -118,7 +118,7 @@
     "no-timetables": "Brak aktywnych rozkładów!",
     "no-users": "BRAK AKTYWNYCH GRACZY",
     "no-spawns": "BRAK OTWARTYCH SPAWNÓW",
-    "no-scenery": "Ups! Nie znaleziono danej stacji bądź jest ona offline!",
+    "no-scenery": "Ups! Ta sceneria nie istnieje!",
     "return-btn": "Wróć na stronę główną"
   },
   "timetables": {
diff --git a/src/router/index.ts b/src/router/index.ts
index 144492e..dd91dd4 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,40 +1,40 @@
-import Vue from 'vue';
-import VueRouter, { RouteConfig } from 'vue-router';
+import Vue from "vue";
+import VueRouter, { RouteConfig } from "vue-router";
 
-import StationsView from '../views/StationsView.vue';
-import TrainsView from '../views/TrainsView.vue';
+import StationsView from "../views/StationsView.vue";
+import TrainsView from "../views/TrainsView.vue";
 
 Vue.use(VueRouter);
 
 const routes: Array<RouteConfig> = [
   {
-    path: '/',
-    name: 'StationsView',
-    component: StationsView,
+    path: "/",
+    name: "StationsView",
+    component: StationsView
   },
   {
-    path: '/trains',
-    name: 'TrainsView',
+    path: "/trains",
+    name: "TrainsView",
     component: TrainsView,
-    props: true,
+    props: true
   },
   {
-    path: '/scenery',
-    name: 'SceneryView',
-    component: () => import('@/views/SceneryView.vue'),
-    props: true,
+    path: "/scenery",
+    name: "SceneryView",
+    component: () => import("@/views/SceneryView.vue"),
+    props: true
   },
   {
-    path: '/history',
-    name: 'HistoryView',
-    component: () => import('@/views/HistoryView.vue'),
-  },
+    path: "/history",
+    name: "HistoryView",
+    component: () => import("@/views/HistoryView.vue")
+  }
 ];
 
 const router = new VueRouter({
-  mode: 'history',
+  mode: "history",
   base: process.env.BASE_URL,
-  routes,
+  routes
 });
 
 export default router;
diff --git a/src/scripts/enums/DataStatus.ts b/src/scripts/enums/DataStatus.ts
new file mode 100644
index 0000000..1d527e1
--- /dev/null
+++ b/src/scripts/enums/DataStatus.ts
@@ -0,0 +1,8 @@
+const enum DataStatus {
+  Initialized = -1,
+  Loading = 0,
+  Error = 1,
+  Loaded = 2
+}
+
+export default DataStatus;
diff --git a/src/scripts/interfaces/StoreData.ts b/src/scripts/interfaces/StoreData.ts
new file mode 100644
index 0000000..a9347cf
--- /dev/null
+++ b/src/scripts/interfaces/StoreData.ts
@@ -0,0 +1,14 @@
+import DataStatus from "../enums/DataStatus";
+import Station from "./Station";
+import Train from "./Train";
+
+export interface StoreData {
+  stationList: Station[];
+  trainList: Train[];
+
+  activeTrainCount: number;
+  activeStationCount: number;
+
+  dataConnectionStatus: DataStatus;
+  timetableDataStatus: DataStatus;
+}
diff --git a/src/scripts/stationFilterManager.ts b/src/scripts/managers/stationFilterManager.ts
similarity index 100%
rename from src/scripts/stationFilterManager.ts
rename to src/scripts/managers/stationFilterManager.ts
diff --git a/src/scripts/storageManager.ts b/src/scripts/managers/storageManager.ts
similarity index 100%
rename from src/scripts/storageManager.ts
rename to src/scripts/managers/storageManager.ts
diff --git a/src/store/store.ts b/src/store/store.ts
index 999f3d4..2c2876a 100644
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -8,13 +8,8 @@ import Train from "@/scripts/interfaces/Train";
 import TrainStop from "@/scripts/interfaces/TrainStop";
 
 import utils from "@/scripts/utils/storeUtils";
-
-enum Status {
-  Initialized = -1,
-  Loading = 0,
-  Error = 1,
-  Loaded = 2
-}
+import DataStatus from "@/scripts/enums/DataStatus";
+import { StoreData } from "@/scripts/interfaces/StoreData";
 
 interface TimetableData {
   trainNo: number;
@@ -62,20 +57,22 @@ export default class Store extends VuexModule {
   private trainCount: number = 0;
   private stationCount: number = 0;
 
-  private dataConnectionStatus: Status = Status.Loading;
-  private sceneryDataStatus: Status = Status.Loading;
-  private timetableLoaded: Status = Status.Loading;
+  private dataConnectionStatus: DataStatus = DataStatus.Loading;
+  private sceneryDataStatus: DataStatus = DataStatus.Loading;
+  private timetableLoaded: DataStatus = DataStatus.Loading;
 
   private stationList: Station[] = [];
   private trainList: Train[] = [];
 
   //GETTERS
-  get getAllData() {
+  get getAllData(): StoreData {
     return {
       stationList: this.stationList,
       trainList: this.trainList,
-      trainCount: this.trainCount,
-      stationCount: this.stationCount,
+
+      activeTrainCount: this.trainCount,
+      activeStationCount: this.stationCount,
+
       dataConnectionStatus: this.dataConnectionStatus,
       timetableDataStatus: this.timetableLoaded
     };
@@ -104,7 +101,7 @@ export default class Store extends VuexModule {
   @Action
   async synchronizeData() {
     this.context.commit("setSceneryData");
-    this.context.commit("setSceneryDataStatus", Status.Loaded);
+    this.context.commit("setSceneryDataStatus", DataStatus.Loaded);
 
     this.context.dispatch("fetchOnlineData");
     setInterval(() => this.context.dispatch("fetchOnlineData"), 20000);
@@ -249,18 +246,18 @@ export default class Store extends VuexModule {
         this.context.dispatch("fetchTimetableData");
       })
       .catch(err => {
-        this.context.commit("setDataConnectionStatus", Status.Error);
+        this.context.commit("setDataConnectionStatus", DataStatus.Error);
       });
   }
 
   //MUTATIONS
   @Mutation
-  private setDataConnectionStatus(status: Status) {
+  private setDataConnectionStatus(status: DataStatus) {
     this.dataConnectionStatus = status;
   }
 
   @Mutation
-  private setSceneryDataStatus(status: Status) {
+  private setSceneryDataStatus(status: DataStatus) {
     this.sceneryDataStatus = status;
   }
 
@@ -385,7 +382,7 @@ export default class Store extends VuexModule {
       });
 
     this.stationCount = this.stationList.filter(station => station.online).length;
-    this.dataConnectionStatus = Status.Loaded;
+    this.dataConnectionStatus = DataStatus.Loaded;
   }
 
   @Mutation
@@ -400,7 +397,7 @@ export default class Store extends VuexModule {
     }, [] as Train[]);
 
     this.trainCount = this.trainList.filter(train => train.online).length;
-    this.dataConnectionStatus = Status.Loaded;
+    this.dataConnectionStatus = DataStatus.Loaded;
   }
 
   @Mutation
@@ -495,6 +492,6 @@ export default class Store extends VuexModule {
       return acc;
     }, [] as Train[]);
 
-    this.timetableLoaded = Status.Loaded;
+    this.timetableLoaded = DataStatus.Loaded;
   }
 }
diff --git a/src/views/SceneryView.vue b/src/views/SceneryView.vue
index f78478b..5b3820c 100644
--- a/src/views/SceneryView.vue
+++ b/src/views/SceneryView.vue
@@ -2,12 +2,13 @@
   <div class="scenery-view">
     <div
       class="scenery-offline"
-      v-if="!stationInfo && dataStatus == 2 && currentPath === '/scenery'"
+      v-if="!stationInfo && isDataLoaded && isComponentVisible"
     >
       {{ $t("scenery.no-scenery") }}
-      <button class="button">
+
+      <action-button>
         <router-link to="/">{{ $t("scenery.return-btn") }}</router-link>
-      </button>
+      </action-button>
     </div>
 
     <div class="scenery-wrapper" v-if="stationInfo">
@@ -16,7 +17,7 @@
       <SceneryTimetable
         :stationInfo="stationInfo"
         :timetableOnly="timetableOnly"
-        :dataStatus="timetableDataStatus"
+        :dataStatus="data.timetableDataStatus"
       />
     </div>
   </div>
@@ -31,14 +32,15 @@ import Station from "@/scripts/interfaces/Station";
 
 import SceneryInfo from "@/components/SceneryView/SceneryInfo.vue";
 import SceneryTimetable from "@/components/SceneryView/SceneryTimetable.vue";
+import { StoreData } from "@/scripts/interfaces/StoreData";
+import DataStatus from "@/scripts/enums/DataStatus";
+import ActionButton from "@/components/Global/ActionButton.vue";
 
 @Component({
-  components: { SceneryInfo, SceneryTimetable },
+  components: { SceneryInfo, SceneryTimetable, ActionButton },
 })
 export default class SceneryView extends Vue {
-  @Getter("getStationList") storeStationList!: Station[];
-  @Getter("getTimetableDataStatus") timetableDataStatus!: number;
-  @Getter("getDataStatus") dataStatus!: number;
+  @Getter("getAllData") data!: StoreData;
 
   timetableOnly: boolean = false;
 
@@ -47,19 +49,22 @@ export default class SceneryView extends Vue {
       this.$route.query["timetable_only"] == "1" ? true : false;
   }
 
-  get currentPath() {
-    return this.$route.path;
+  get isComponentVisible() {
+    return this.$route.path === "/scenery";
   }
 
-  get stationInfo(): Station | null {
-    if (!this.$route.query.hash || !this.storeStationList) return null;
+  get isDataLoaded() {
+    return this.data.dataConnectionStatus == DataStatus.Loaded;
+  }
 
-    const info =
-      this.storeStationList.find(
-        (station) => station.stationHash === this.$route.query.hash.toString()
-      ) || null;
+  get stationInfo(): Station | undefined {
+    if (!this.$route.query.station) return;
 
-    return info;
+    return this.data.stationList.find(
+      (station) =>
+        station.stationName ===
+        this.$route.query.station.toString().replaceAll("_", " ")
+    );
   }
 }
 </script>
@@ -89,9 +94,8 @@ $sceneryBgCol: #333;
 
     font-size: 2em;
 
-    .button {
+    button {
       margin: 1em auto;
-      font-size: 0.85em;
     }
   }
 
diff --git a/src/views/StationsView.vue b/src/views/StationsView.vue
index bcd5a76..034efc5 100644
--- a/src/views/StationsView.vue
+++ b/src/views/StationsView.vue
@@ -59,12 +59,13 @@
 
 <script lang="ts">
 import { Vue, Component } from "vue-property-decorator";
+
 import { Getter } from "vuex-class";
 
 import Station from "@/scripts/interfaces/Station";
 
-import StorageManager from "@/scripts/storageManager";
-import StationFilterManager from "@/scripts/stationFilterManager";
+import StorageManager from "@/scripts/managers/storageManager";
+import StationFilterManager from "@/scripts/managers/stationFilterManager";
 
 import inputData from "@/data/options.json";
 
@@ -72,6 +73,8 @@ import StationTable from "@/components/StationsView/StationTable.vue";
 import FilterCard from "@/components/StationsView/FilterCard.vue";
 import DonationModal from "@/components/Global/DonationModal.vue";
 import ActionButton from "@/components/Global/ActionButton.vue";
+import { StoreData } from "@/scripts/interfaces/StoreData";
+import DataStatus from "@/scripts/enums/DataStatus";
 
 @Component({
   components: {
@@ -98,18 +101,18 @@ export default class StationsView extends Vue {
   inputs = inputData;
 
   @Getter("getStationList") stationList!: Station[];
-  @Getter("getAllData") data;
+  @Getter("getAllData") data!: StoreData;
 
   get dataStatusClass() {
-    if (this.data.dataConnectionStatus == 0) return "loading";
-    if (this.data.dataConnectionStatus == 1) return "error";
+    if (this.data.dataConnectionStatus == DataStatus.Loading) return "loading";
+    if (this.data.dataConnectionStatus == DataStatus.Error) return "error";
 
     return "success";
   }
 
   get timetableDataStatusClass() {
-    if (this.data.timetableDataStatus == 0) return "loading";
-    if (this.data.timetableDataStatus == 1) return "error";
+    if (this.data.timetableDataStatus == DataStatus.Loading) return "loading";
+    if (this.data.timetableDataStatus == DataStatus.Error) return "error";
 
     return "success";
   }
@@ -186,8 +189,7 @@ export default class StationsView extends Vue {
   }
 
   setFocusedStation(name: string) {
-    if (this.focusedStationName == name) this.focusedStationName = "";
-    else this.focusedStationName = name;
+    this.focusedStationName = this.focusedStationName == name ? "" : name;
   }
 
   get focusedStationInfo() {