diff --git a/src/components/StationsView/StationTimetable.vue b/src/components/StationsView/StationTimetable.vue
index 87e8728..5cf321c 100644
--- a/src/components/StationsView/StationTimetable.vue
+++ b/src/components/StationsView/StationTimetable.vue
@@ -162,9 +162,8 @@ export default class StationTimetable extends Vue {
 
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(0, 1fr));
-    gap: 0 1rem;
 
-    padding: 0 2rem;
+    padding: 0 1rem;
 
     @include smallScreen() {
       display: flex;
@@ -176,8 +175,9 @@ export default class StationTimetable extends Vue {
 
 .timetable {
   &-general {
-    padding: 0.3rem 0.5rem;
-    border: 1px solid white;
+    padding: 0.3rem 0.7rem;
+    border: 2px solid white;
+    border-radius: 10px;
 
     display: flex;
     align-items: center;
@@ -197,8 +197,8 @@ export default class StationTimetable extends Vue {
     }
 
     display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(0, 1fr));
-    font-size: 1.3em;
+    grid-template-columns: repeat(auto-fit, minmax(50px, 1fr));
+    font-size: 1.35em;
   }
 }
 
diff --git a/src/styles/user_badge.scss b/src/styles/user_badge.scss
index 1583e4e..e0395a4 100644
--- a/src/styles/user_badge.scss
+++ b/src/styles/user_badge.scss
@@ -5,15 +5,16 @@ $online: gold;
 $terminated: red;
 $disconnected: slategray;
 
+
 .user-badge {
-    border: 1px solid white;
+    border: 2px solid white;
     z-index: 4;
 
-    margin-top: 0.3rem;
-    margin-right: 0.3rem;
+    margin-top: 0.5rem;
+    margin-right: 0.5rem;
 
     border-radius: 0.7em;
-    padding: 0.2em 0.5em;
+    padding: 0.3em 0.5em;
     font-size: 0.95em;
 
     &.borderless {
@@ -23,7 +24,7 @@ $disconnected: slategray;
     }
 
     &.no-timetable {
-        border: 1px solid $no-timetable;
+        border: 2px solid $no-timetable;
 
         a {
             color: $no-timetable;
@@ -32,19 +33,19 @@ $disconnected: slategray;
     }
 
     &.departed {
-        border: 1px solid $departed;
+        border: 2px solid $departed;
     }
 
     &.stopped {
-        border: 1px solid $stopped;
+        border: 2px solid $stopped;
     }
 
     &.online {
-        border: 1px solid $online;
+        border: 2px solid $online;
     }
 
     &.terminated {
-        border: 1px solid $terminated;
+        border: 2px solid $terminated;
     }
 
     &.disconnected {