diff --git a/configurations/swtbahn-full/bidib_train_config.yml b/configurations/swtbahn-full/bidib_train_config.yml
index 59b81014..cc62c5d3 100644
--- a/configurations/swtbahn-full/bidib_train_config.yml
+++ b/configurations/swtbahn-full/bidib_train_config.yml
@@ -20,7 +20,7 @@ trains:
       - id: cabin_light
         bit: 0
         initial: 1
-    weight: 100.0g
+    weight: 77.0g
     length: 13.0cm
     type: cargo
   - id: cargo_bayern
@@ -43,7 +43,7 @@ trains:
       - id: cabin_light
         bit: 0
         initial: 1
-    weight: 100.0g
+    weight: 72.0g
     length: 13.0cm
     type: cargo
   - id: cargo_green
@@ -63,7 +63,7 @@ trains:
       - id: head_light
         bit: 4
         initial: 1
-    weight: 100.0g
+    weight: 80.0g
     length: 13.0cm
     type: cargo
   - id: regional_odeg
@@ -86,7 +86,7 @@ trains:
       - id: cabin_light
         bit: 0
         initial: 1
-    weight: 100.0g
+    weight: 194.0g
     length: 25.0cm
     type: passenger
   - id: regional_brengdirect
@@ -109,6 +109,46 @@ trains:
       - id: cabin_light
         bit: 0
         initial: 1
-    weight: 100.0g
-    length: 23.0cm
+    weight: 236.0g
+    length: 35.0cm
+    type: passenger
+  - id: cargo_g1000bb
+    dcc-address: 0x0050
+    dcc-speed-steps: 126
+    calibration:
+      - 5
+      - 15
+      - 30
+      - 45
+      - 60
+      - 75
+      - 90
+      - 105
+      - 120
+    peripherals:
+      - id: head_light
+        bit: 4
+        initial: 1
+    weight: 35.0g
+    length: 10.0cm
+    type: cargo
+  - id: perso_sbb
+    dcc-address: 0x004F
+    dcc-speed-steps: 126
+    calibration:
+      - 5
+      - 15
+      - 30
+      - 45
+      - 60
+      - 75
+      - 90
+      - 105
+      - 120
+    peripherals:
+      - id: head_light
+        bit: 4
+        initial: 1
+    weight: 81.0g
+    length: 12.0cm
     type: passenger
diff --git a/configurations/swtbahn-full/config.bahn b/configurations/swtbahn-full/config.bahn
index 10e20c46..e57260c2 100644
--- a/configurations/swtbahn-full/config.bahn
+++ b/configurations/swtbahn-full/config.bahn
@@ -806,21 +806,21 @@ module SWTbahnFull
 
     trains
         cargo_db 0x007F  # addr high | addr low
-        steps 126 
-        calibration
-            5 
-            15 
-            30 
-            45 
-            60 
-            75 
-            90 
-            105 
-            120 
-        end 
-        weight 100g 
-        length 13cm 
-        type cargo
+            steps 126 
+            calibration
+                5 
+                15 
+                30 
+                45 
+                60 
+                75 
+                90 
+                105 
+                120 
+            end 
+            weight 77g 
+            length 13cm 
+            type cargo
         peripherals
             head_light 
                 bit 4        # a value in range 0..31
@@ -829,28 +829,38 @@ module SWTbahnFull
                 bit 0        # a value in range 0..31
                 initial 1
         end
-        
-        cargo_bayern 0x0070 steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 100g length 13cm type cargo
+
+        cargo_bayern 0x0070 steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 72g length 13cm type cargo
         peripherals
             head_light bit 4 initial 1
             cabin_light bit 0 initial 1
         end
-        
-        cargo_green 0x006F steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 100g length 13cm type cargo
+
+        cargo_green 0x006F steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 80g length 13cm type cargo
         peripherals
             head_light bit 4 initial 1
         end
 
-        regional_odeg 0x0060 steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 100g length 25cm type passenger
+        regional_odeg 0x0060 steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 194g length 25cm type passenger
         peripherals
             head_light bit 4 initial 1
             cabin_light bit 0 initial 1
         end
-        
-        regional_brengdirect 0x005F steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 100g length 23cm type passenger
+
+        regional_brengdirect 0x005F steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 236g length 35cm type passenger
         peripherals
             head_light bit 4 initial 1
             cabin_light bit 0 initial 1
         end
+
+        cargo_g1000bb 0x0050 steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 35g length 10cm type cargo
+        peripherals
+            head_light bit 4 initial 1
+        end
+
+        perso_sbb 0x004F steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 81g length 12cm type passenger
+        peripherals
+            head_light bit 4 initial 1
+        end
     end
 end
diff --git a/configurations/swtbahn-lite/bidib_train_config.yml b/configurations/swtbahn-lite/bidib_train_config.yml
index 59b81014..cc62c5d3 100644
--- a/configurations/swtbahn-lite/bidib_train_config.yml
+++ b/configurations/swtbahn-lite/bidib_train_config.yml
@@ -20,7 +20,7 @@ trains:
       - id: cabin_light
         bit: 0
         initial: 1
-    weight: 100.0g
+    weight: 77.0g
     length: 13.0cm
     type: cargo
   - id: cargo_bayern
@@ -43,7 +43,7 @@ trains:
       - id: cabin_light
         bit: 0
         initial: 1
-    weight: 100.0g
+    weight: 72.0g
     length: 13.0cm
     type: cargo
   - id: cargo_green
@@ -63,7 +63,7 @@ trains:
       - id: head_light
         bit: 4
         initial: 1
-    weight: 100.0g
+    weight: 80.0g
     length: 13.0cm
     type: cargo
   - id: regional_odeg
@@ -86,7 +86,7 @@ trains:
       - id: cabin_light
         bit: 0
         initial: 1
-    weight: 100.0g
+    weight: 194.0g
     length: 25.0cm
     type: passenger
   - id: regional_brengdirect
@@ -109,6 +109,46 @@ trains:
       - id: cabin_light
         bit: 0
         initial: 1
-    weight: 100.0g
-    length: 23.0cm
+    weight: 236.0g
+    length: 35.0cm
+    type: passenger
+  - id: cargo_g1000bb
+    dcc-address: 0x0050
+    dcc-speed-steps: 126
+    calibration:
+      - 5
+      - 15
+      - 30
+      - 45
+      - 60
+      - 75
+      - 90
+      - 105
+      - 120
+    peripherals:
+      - id: head_light
+        bit: 4
+        initial: 1
+    weight: 35.0g
+    length: 10.0cm
+    type: cargo
+  - id: perso_sbb
+    dcc-address: 0x004F
+    dcc-speed-steps: 126
+    calibration:
+      - 5
+      - 15
+      - 30
+      - 45
+      - 60
+      - 75
+      - 90
+      - 105
+      - 120
+    peripherals:
+      - id: head_light
+        bit: 4
+        initial: 1
+    weight: 81.0g
+    length: 12.0cm
     type: passenger
diff --git a/configurations/swtbahn-lite/config.bahn b/configurations/swtbahn-lite/config.bahn
index d5062966..9fd7242a 100644
--- a/configurations/swtbahn-lite/config.bahn
+++ b/configurations/swtbahn-lite/config.bahn
@@ -1,191 +1,201 @@
 module SWTbahnLite
-  boards
-    master 0xDA000D680052EF
-      features 
-        0x03:0x14  # seckack on, 200ms
-        0x6E:0x00  # track output default off
-      end
-    lightcontrol 0x45000D6B0083EC
-    onecontrol 0x05000D7500DBED
-  end
-  
-  segments master
-    seg1 0x00 length 10cm
-    seg2 0x01 length 57.5cm
-    seg3 0x02 length 11.95cm
-    seg4 0x03 length 19cm
-    seg5 0x04 length 11.95cm
-    seg6 0x05 length 61.4cm
-    seg7 0x06 length 10cm
-    seg8 0x07 length 13cm
-    seg9 0x08 length 8cm
-    seg10 0x09 length 70.75cm
-    seg11 0x0A length 15.85cm
-    seg12 0x0B length 11.3cm
-    seg13 0x0C length 10.9cm
-    seg14 0x0D length 8cm
-    seg15 0x0E length 56cm
-    seg16 0x0F length 8.15cm
-    seg17 0x10 length 11.3cm
-    seg18 0x11 length 20.2cm
-    seg19 0x12 length 40.8cm
-    seg20 0x13 length 10.2cm
-    seg21 0x14 length 10.9cm
-    seg22 0x15 length 11.3cm
-    seg23 0x16 length 5cm
-    seg24 0x17 length 50cm
-    seg25 0x18 length 8cm
-    seg26 0x19 length 17.3cm
-    seg27 0x1A length 10cm
-    seg28 0x1B length 50cm
-    seg29 0x1C length 10cm
-  end
-  
-  signals lightcontrol
-    entry signal1 0x00
-    entry signal2 0x01
-    entry signal3 0x02
-    entry signal4 0x03
-    entry signal5 0x04
-    entry signal6 0x05
-    block signal7 0x06
-    block signal8 0x07
-    block signal9 0x08
-    block signal10 0x09
-    block signal11 0x0A
-    halt signal12 0xF0    # Physically part of signalends
-    halt signal13 0xF1    # Physically part of signalends
-    block signal14 0x0B
-    halt signal15 0xF2    # Physically part of signalends
-    halt signalends 0x12
-  end
-
-  points onecontrol
-    point1 0x00 segment seg4 normal 0x01 reverse 0x00 initial normal
-    point2 0x01 segment seg8 normal 0x01 reverse 0x00 initial normal
-    point3 0x02 segment seg12 normal 0x01 reverse 0x00 initial normal
-    point4 0x03 segment seg13 normal 0x01 reverse 0x00 initial normal
-    point5 0x04 segment seg17 normal 0x01 reverse 0x00 initial normal
-    point6 0x05 segment seg21 normal 0x01 reverse 0x00 initial normal
-    point7 0x06 segment seg22 normal 0x01 reverse 0x00 initial normal
-  end
-  
-  peripherals lightcontrol
-    onebit lanterns 0x13 port 0x00FF    # Exact port address is not essential
-  end
-
-  blocks
-    # Clockwise reading direction
-  
-    # Regular blocks
-    block1 overlap seg18 main seg19 overlap seg20 
-    block2 overlap seg5 main seg6 overlap seg7 
-    block3 overlap seg1 main seg2 overlap seg3
-    block4 overlap seg14 main seg15 overlap seg16 
-    block5 overlap seg9 main seg10 overlap seg11
+    boards
+        master 0xDA000D680052EF
+            features 
+                0x03:0x14  # seckack on, 200ms
+                0x6E:0x00  # track output default off
+            end
+        lightcontrol 0x45000D6B0083EC
+        onecontrol 0x05000D7500DBED
+    end
     
-    # buffer blocks
-    buffer main seg26
-  end
-
-  platforms
-    platform1 overlap seg29 main seg28 overlap seg27
-    platform2 overlap seg23 main seg24 overlap seg25
-  end
-
-  layout
-    # Clockwise reading direction
-  
-    block1.up -- point6.stem 
-    block1.down -- point5.stem
+    segments master
+        seg1 0x00 length 10cm
+        seg2 0x01 length 57.5cm
+        seg3 0x02 length 11.95cm
+        seg4 0x03 length 19cm
+        seg5 0x04 length 11.95cm
+        seg6 0x05 length 61.4cm
+        seg7 0x06 length 10cm
+        seg8 0x07 length 13cm
+        seg9 0x08 length 8cm
+        seg10 0x09 length 70.75cm
+        seg11 0x0A length 15.85cm
+        seg12 0x0B length 11.3cm
+        seg13 0x0C length 10.9cm
+        seg14 0x0D length 8cm
+        seg15 0x0E length 56cm
+        seg16 0x0F length 8.15cm
+        seg17 0x10 length 11.3cm
+        seg18 0x11 length 20.2cm
+        seg19 0x12 length 40.8cm
+        seg20 0x13 length 10.2cm
+        seg21 0x14 length 10.9cm
+        seg22 0x15 length 11.3cm
+        seg23 0x16 length 5cm
+        seg24 0x17 length 50cm
+        seg25 0x18 length 8cm
+        seg26 0x19 length 17.3cm
+        seg27 0x1A length 10cm
+        seg28 0x1B length 50cm
+        seg29 0x1C length 10cm
+    end
     
-    block2.up -- point2.stem
-    block2.down -- point1.stem
+    signals lightcontrol
+        entry signal1 0x00
+        entry signal2 0x01
+        entry signal3 0x02
+        entry signal4 0x03
+        entry signal5 0x04
+        entry signal6 0x05
+        block signal7 0x06
+        block signal8 0x07
+        block signal9 0x08
+        block signal10 0x09
+        block signal11 0x0A
+        halt signal12 0xF0    # Physically part of signalends
+        halt signal13 0xF1    # Physically part of signalends
+        block signal14 0x0B
+        halt signal15 0xF2    # Physically part of signalends
+        halt signalends 0x12
+    end
 
-    block3.up -- point1.straight
-    block3.down -- point3.straight
-    
-    block4.up -- point1.side
-    block4.down -- point4.stem
+    points onecontrol
+        point1 0x00 segment seg4 normal 0x01 reverse 0x00 initial normal
+        point2 0x01 segment seg8 normal 0x01 reverse 0x00 initial normal
+        point3 0x02 segment seg12 normal 0x01 reverse 0x00 initial normal
+        point4 0x03 segment seg13 normal 0x01 reverse 0x00 initial normal
+        point5 0x04 segment seg17 normal 0x01 reverse 0x00 initial normal
+        point6 0x05 segment seg21 normal 0x01 reverse 0x00 initial normal
+        point7 0x06 segment seg22 normal 0x01 reverse 0x00 initial normal
+    end
     
-    block5.up -- point3.stem
-    block5.down -- point2.straight
+    peripherals lightcontrol
+        onebit lanterns 0x13 port 0x00FF    # Exact port address is not essential
+    end
+
+    blocks
+        # Clockwise reading direction
     
-    platform1.up -- point5.straight
-    platform2.down -- point7.stem
-    buffer.up -- point7.straight 
+        # Regular blocks
+        block1 overlap seg18 main seg19 overlap seg20 
+        block2 overlap seg5 main seg6 overlap seg7 
+        block3 overlap seg1 main seg2 overlap seg3
+        block4 overlap seg14 main seg15 overlap seg16 
+        block5 overlap seg9 main seg10 overlap seg11
+        
+        # buffer blocks
+        buffer main seg26
+    end
 
-    # signals
-    signal1 -- block3.down
-    signal2 -- block3.up
-    signal3 -- block2.down
-    signal4 -- block2.up
-    signal5 -- block5.down
-    signal6 -- block5.up
-    signal7 -- block4.down
-    signal8 -- block4.up
-    signal9 -- block1.down
-    signal10 -- block1.up
-    signal11 -- platform2.down
-    signal12 -- platform2.up
-    signal13 -- buffer.down
-    signal14 -- platform1.up
-    signal15 -- platform1.down
+    platforms
+        platform1 overlap seg29 main seg28 overlap seg27
+        platform2 overlap seg23 main seg24 overlap seg25
+    end
 
-    # points
-    point5.side -- point2.side
-    point6.straight -- point4.straight
-    point6.side -- point7.side
-    point3.side -- point4.side
-  end
+    layout
+        # Clockwise reading direction
+    
+        block1.up -- point6.stem 
+        block1.down -- point5.stem
+        
+        block2.up -- point2.stem
+        block2.down -- point1.stem
 
-  trains
-    cargo_db 0x007F  # addr high | addr low
-      steps 126 
-      calibration
-        5 
-        15 
-        30 
-        45 
-        60 
-        75 
-        90 
-        105 
-        120 
-      end 
-      weight 100g 
-      length 13cm 
-      type cargo
-      peripherals
-        head_light 
-          bit 4        # a value in range 0..31
-          initial 1
-        cabin_light 
-          bit 0        # a value in range 0..31
-          initial 1
-    end
+        block3.up -- point1.straight
+        block3.down -- point3.straight
         
-    cargo_bayern 0x0070 steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 100g length 13cm type cargo
-    peripherals
-      head_light bit 4 initial 1
-      cabin_light bit 0 initial 1
-    end
+        block4.up -- point1.side
+        block4.down -- point4.stem
         
-    cargo_green 0x006F steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 100g length 13cm type cargo
-    peripherals
-      head_light bit 4 initial 1
-    end
+        block5.up -- point3.stem
+        block5.down -- point2.straight
+        
+        platform1.up -- point5.straight
+        platform2.down -- point7.stem
+        buffer.up -- point7.straight 
+
+        # signals
+        signal1 -- block3.down
+        signal2 -- block3.up
+        signal3 -- block2.down
+        signal4 -- block2.up
+        signal5 -- block5.down
+        signal6 -- block5.up
+        signal7 -- block4.down
+        signal8 -- block4.up
+        signal9 -- block1.down
+        signal10 -- block1.up
+        signal11 -- platform2.down
+        signal12 -- platform2.up
+        signal13 -- buffer.down
+        signal14 -- platform1.up
+        signal15 -- platform1.down
 
-    regional_odeg 0x0060 steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 100g length 25cm type passenger
-    peripherals
-      head_light bit 4 initial 1
-      cabin_light bit 0 initial 1
+        # points
+        point5.side -- point2.side
+        point6.straight -- point4.straight
+        point6.side -- point7.side
+        point3.side -- point4.side
     end
-        
-    regional_brengdirect 0x005F steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 100g length 23cm type passenger
-    peripherals
-      head_light bit 4 initial 1
-      cabin_light bit 0 initial 1
+
+    trains
+        cargo_db 0x007F  # addr high | addr low
+            steps 126 
+            calibration
+                5 
+                15 
+                30 
+                45 
+                60 
+                75 
+                90 
+                105 
+                120 
+            end 
+            weight 77g 
+            length 13cm 
+            type cargo
+        peripherals
+            head_light 
+                bit 4        # a value in range 0..31
+                initial 1
+            cabin_light 
+                bit 0        # a value in range 0..31
+                initial 1
+        end
+
+        cargo_bayern 0x0070 steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 72g length 13cm type cargo
+        peripherals
+            head_light bit 4 initial 1
+            cabin_light bit 0 initial 1
+        end
+
+        cargo_green 0x006F steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 80g length 13cm type cargo
+        peripherals
+            head_light bit 4 initial 1
+        end
+
+        regional_odeg 0x0060 steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 194g length 25cm type passenger
+        peripherals
+            head_light bit 4 initial 1
+            cabin_light bit 0 initial 1
+        end
+
+        regional_brengdirect 0x005F steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 236g length 35cm type passenger
+        peripherals
+            head_light bit 4 initial 1
+            cabin_light bit 0 initial 1
+        end
+
+        cargo_g1000bb 0x0050 steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 35g length 10cm type cargo
+        peripherals
+            head_light bit 4 initial 1
+        end
+
+        perso_sbb 0x004F steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 81g length 12cm type passenger
+        peripherals
+            head_light bit 4 initial 1
+        end
     end
-  end
 end
diff --git a/configurations/swtbahn-standard/bidib_train_config.yml b/configurations/swtbahn-standard/bidib_train_config.yml
index 59b81014..cc62c5d3 100644
--- a/configurations/swtbahn-standard/bidib_train_config.yml
+++ b/configurations/swtbahn-standard/bidib_train_config.yml
@@ -20,7 +20,7 @@ trains:
       - id: cabin_light
         bit: 0
         initial: 1
-    weight: 100.0g
+    weight: 77.0g
     length: 13.0cm
     type: cargo
   - id: cargo_bayern
@@ -43,7 +43,7 @@ trains:
       - id: cabin_light
         bit: 0
         initial: 1
-    weight: 100.0g
+    weight: 72.0g
     length: 13.0cm
     type: cargo
   - id: cargo_green
@@ -63,7 +63,7 @@ trains:
       - id: head_light
         bit: 4
         initial: 1
-    weight: 100.0g
+    weight: 80.0g
     length: 13.0cm
     type: cargo
   - id: regional_odeg
@@ -86,7 +86,7 @@ trains:
       - id: cabin_light
         bit: 0
         initial: 1
-    weight: 100.0g
+    weight: 194.0g
     length: 25.0cm
     type: passenger
   - id: regional_brengdirect
@@ -109,6 +109,46 @@ trains:
       - id: cabin_light
         bit: 0
         initial: 1
-    weight: 100.0g
-    length: 23.0cm
+    weight: 236.0g
+    length: 35.0cm
+    type: passenger
+  - id: cargo_g1000bb
+    dcc-address: 0x0050
+    dcc-speed-steps: 126
+    calibration:
+      - 5
+      - 15
+      - 30
+      - 45
+      - 60
+      - 75
+      - 90
+      - 105
+      - 120
+    peripherals:
+      - id: head_light
+        bit: 4
+        initial: 1
+    weight: 35.0g
+    length: 10.0cm
+    type: cargo
+  - id: perso_sbb
+    dcc-address: 0x004F
+    dcc-speed-steps: 126
+    calibration:
+      - 5
+      - 15
+      - 30
+      - 45
+      - 60
+      - 75
+      - 90
+      - 105
+      - 120
+    peripherals:
+      - id: head_light
+        bit: 4
+        initial: 1
+    weight: 81.0g
+    length: 12.0cm
     type: passenger
diff --git a/configurations/swtbahn-standard/config.bahn b/configurations/swtbahn-standard/config.bahn
index 20e696e6..bed7c8aa 100644
--- a/configurations/swtbahn-standard/config.bahn
+++ b/configurations/swtbahn-standard/config.bahn
@@ -1,238 +1,238 @@
 module SWTbahnStandard
-	boards
-		onecontrol1 0x05000D7500E8ED
-		onecontrol2 0x05000D7500DAED
-		lightcontrol1 0x45000D6B0072EC
-		lightcontrol2 0x45000D6B0067EC
-		master 0xDA000D680001EE
-			features 
-				0x03:0x14  # seckack on, 200ms
-				0x6E:0x00  # track output default off
-			end
-	end
-	
-	segments master
-		seg1 0x00 length 20cm
-		seg2 0x01 length 11.3cm
-		seg3 0x02 length 10cm
-		seg4 0x03 length 72.5cm
-		seg5 0x04 length 10cm
-		seg6 0x05 length 13cm
-		seg7 0x06 length 17.2cm
-		seg8 0x07 length 71.1cm
-		seg9 0x08 length 17.2cm
-		seg10 0x09 length 13cm
-		seg11 0x0A length 10cm
-		seg12 0x0B length 113.7cm
-		seg13 0x0C length 18.4cm
-		seg14 0x0D length 26cm
-		seg15 0x0E length 23.9cm
-		seg16 0x0F length 77.6cm
-		seg17 0x20 length 10.3cm
-		seg18 0x26 length 20.4cm
-		seg19 0x22 length 12cm
-		seg20 0x23 length 17.1cm
-		seg21 0x24 length 84.1cm
-		seg22 0x25 length 31.35cm
-		seg23 0x21 length 21.3cm
-		seg24 0x10 length 40.5cm
-		seg25 0x11 length 51.4cm
-		seg26 0x12 length 30.7cm
-		seg27 0x13 length 10.2cm
-		seg28 0x27 length 80.8cm
-		seg29 0x28 length 10cm
-		seg30a 0x1C length 4cm     # GBM16T: OFF sensor only
-		seg30b 0x1D length 5cm     # Kehrschleife: OFF sensor, reversible polarity
-		seg31 0x1E length 55.1cm   # Kehrschleife: main, reversible polarity
-		seg32a 0x1B length 6cm     # Kehrschleife: ON sensor, reversible polarity
-		seg32b 0x1F length 4cm     # GBM16T: ON sensor only
-		seg33 0x14 length 20.9cm
-		seg34 0x15 length 14.1cm
-		seg35 0x16 length 21cm
-		seg36 0x17 length 11.2cm
-		seg37 0x18 length 55cm
-		seg38 0x19 length 10cm
-		seg39 0x1A length 17.1cm
-		seg40 0x29 length 56.7cm
-		seg41 0x2A length 10cm
-	end
-	
-	reversers master
-		reverser 20051 block7
-	end
-
-	signals lightcontrol1
-		entry signal3 0x00
-		entry signal4 0x01
-		entry signal5 0x02
-		entry signal6 0x03
-		entry signal7 0x04
-		entry signal11 0x05
-		entry signal12 0x06
-		entry signal13 0x07
-		halt signal17 0x08
-		halt signal19 0x09
-		platformlight platformlights 0x0A
-	end
-
-	signals lightcontrol2
-		halt signal1 0x00
-		entry signal2 0x01
-		entry signal8 0x02
-		entry signal9 0x03
-		entry signal10 0x04
-		entry signal14 0x05
-		entry signal15 0x06
-		entry signal16 0x07
-		entry signal18 0x08
-	end
-
-	points onecontrol1
-		point2 0x00 segment seg6 normal 0x01 reverse 0x00 initial normal
-		point3 0x01 segment seg10 normal 0x01 reverse 0x00 initial normal
-		point4 0x02 segment seg23 normal 0x01 reverse 0x00 initial normal
-		point5 0x03 segment seg24 normal 0x01 reverse 0x00 initial normal
-		point7 0x04 segment seg19 normal 0x01 reverse 0x00 initial normal
-		point8 0x05 segment seg18 normal 0x01 reverse 0x00 initial normal
-	end
-
-	points onecontrol2
-		point1 0x00 segment seg2 normal 0x01 reverse 0x00 initial normal
-		point6 0x01 segment seg14 normal 0x01 reverse 0x00 initial normal
-		point9 0x02 segment seg25 normal 0x01 reverse 0x00 initial normal
-		point10 0x03 segment seg26 normal 0x01 reverse 0x00 initial normal
-		point11 0x04 segment seg33 normal 0x01 reverse 0x00 initial normal
-		point12 0x05 segment seg34 normal 0x01 reverse 0x00 initial normal
-	end
-
-	peripherals onecontrol1
-		onebit sync1 0x06 port 0x0027      # Exact port address is not essential for output-only behaviour
-		onebit lanterns1 0x07 port 0x0018  # Exact port address is not essential for output-only behaviour
-	end
-
-	peripherals onecontrol2
-		onebit sync2 0x06 port 0x0027
-		onebit lanterns2 0x07 port 0x0018  # Exact port address is not essential for output-only behaviour
-	end
-
-	blocks
-		# Anti-clockwise reading direction
-		
-		# blocks
-		block1 overlap seg3 main seg4 overlap seg5 limit 300km/h trains cargo passenger end
-		block2 overlap seg7 main seg8 overlap seg9 limit 350km/h
-		block3 overlap seg11 main seg12 overlap seg13 trains cargo end
-		block4 overlap seg15 main seg16 overlap seg17
-		block5 overlap seg27 main seg28 overlap seg29
-		block6 overlap seg20 main seg21 overlap seg22
-
-		# Kehrschleifenmodul: actively reverses the block's orientation.
-		block7 overlap seg30b main seg31 overlap seg32b
-
-		# buffers
-		buffer main seg1
-	end
-
-	crossings
-		crossing1 segment seg35
-	end
-
-	platforms
-		platform1 overlap seg36 main seg37 overlap seg38 reversed
-		platform2 overlap seg39 main seg40 overlap seg41 reversed
-	end
-
-	layout
-		# Anti-clockwise reading direction
-
-		# blocks
-		block1.down -- point1.stem
-		block1.up -- point2.straight
-
-		block2.down -- point2.stem
-		block2.up -- point3.stem
-
-		block3.down -- point3.straight
-		block3.up -- point6.stem
-
-		block4.down -- point6.side
-		block4.up -- point8.side
-
-		block5.down -- point10.straight
-		block5.up -- point7.stem
-
-		block6.down -- point7.straight
-		block6.up -- point4.straight
-
-		block7.down -- point10.side
-		block7.up -- point12.down2
-
-		platform2.down -- point12.up2
-
-		# crossings
-		crossing1.down1 -- point11.side
-		crossing1.down2 -- point12.up1
-		crossing1.up1 -- point5.side
-		crossing1.up2 -- platform1.down
-
-		# points
-		point1.straight -- buffer.up
-		point1.side -- point6.straight
-
-		point2.side -- point8.stem
-
-		point3.side -- point4.side
-
-		point4.stem -- point5.stem
-
-		point5.straight -- point9.straight
-
-		point7.side -- point8.straight
-
-		point9.stem -- point10.stem
-		point9.side -- point11.stem
-
-		point11.straight -- point12.down1
-
-		# signals
-		signal1 -- buffer.down
-		signal2 -- block1.down
-		signal3 -- block1.up
-		signal4 -- block2.down
-		signal5 -- block6.up
-		signal6 -- block2.up
-		signal7 -- block3.down
-		signal8 -- block3.up
-		signal9 -- block5.down
-		signal10 -- block4.down
-		signal11 -- block5.up
-		signal12 -- block4.up
-		signal13 -- block6.down
-		signal14 -- block7.down
-		signal15 -- block7.up
-		signal16 -- platform1.down
-		signal17 -- platform1.up
-		signal18 -- platform2.down
-		signal19 -- platform2.up
-	end
+    boards
+        onecontrol1 0x05000D7500E8ED
+        onecontrol2 0x05000D7500DAED
+        lightcontrol1 0x45000D6B0072EC
+        lightcontrol2 0x45000D6B0067EC
+        master 0xDA000D680001EE
+            features 
+                0x03:0x14  # seckack on, 200ms
+                0x6E:0x00  # track output default off
+            end
+    end
+    
+    segments master
+        seg1 0x00 length 20cm
+        seg2 0x01 length 11.3cm
+        seg3 0x02 length 10cm
+        seg4 0x03 length 72.5cm
+        seg5 0x04 length 10cm
+        seg6 0x05 length 13cm
+        seg7 0x06 length 17.2cm
+        seg8 0x07 length 71.1cm
+        seg9 0x08 length 17.2cm
+        seg10 0x09 length 13cm
+        seg11 0x0A length 10cm
+        seg12 0x0B length 113.7cm
+        seg13 0x0C length 18.4cm
+        seg14 0x0D length 26cm
+        seg15 0x0E length 23.9cm
+        seg16 0x0F length 77.6cm
+        seg17 0x20 length 10.3cm
+        seg18 0x26 length 20.4cm
+        seg19 0x22 length 12cm
+        seg20 0x23 length 17.1cm
+        seg21 0x24 length 84.1cm
+        seg22 0x25 length 31.35cm
+        seg23 0x21 length 21.3cm
+        seg24 0x10 length 40.5cm
+        seg25 0x11 length 51.4cm
+        seg26 0x12 length 30.7cm
+        seg27 0x13 length 10.2cm
+        seg28 0x27 length 80.8cm
+        seg29 0x28 length 10cm
+        seg30a 0x1C length 4cm     # GBM16T: OFF sensor only
+        seg30b 0x1D length 5cm     # Kehrschleife: OFF sensor, reversible polarity
+        seg31 0x1E length 55.1cm   # Kehrschleife: main, reversible polarity
+        seg32a 0x1B length 6cm     # Kehrschleife: ON sensor, reversible polarity
+        seg32b 0x1F length 4cm     # GBM16T: ON sensor only
+        seg33 0x14 length 20.9cm
+        seg34 0x15 length 14.1cm
+        seg35 0x16 length 21cm
+        seg36 0x17 length 11.2cm
+        seg37 0x18 length 55cm
+        seg38 0x19 length 10cm
+        seg39 0x1A length 17.1cm
+        seg40 0x29 length 56.7cm
+        seg41 0x2A length 10cm
+    end
+    
+    reversers master
+        reverser 20051 block7
+    end
+
+    signals lightcontrol1
+        entry signal3 0x00
+        entry signal4 0x01
+        entry signal5 0x02
+        entry signal6 0x03
+        entry signal7 0x04
+        entry signal11 0x05
+        entry signal12 0x06
+        entry signal13 0x07
+        halt signal17 0x08
+        halt signal19 0x09
+        platformlight platformlights 0x0A
+    end
+
+    signals lightcontrol2
+        halt signal1 0x00
+        entry signal2 0x01
+        entry signal8 0x02
+        entry signal9 0x03
+        entry signal10 0x04
+        entry signal14 0x05
+        entry signal15 0x06
+        entry signal16 0x07
+        entry signal18 0x08
+    end
+
+    points onecontrol1
+        point2 0x00 segment seg6 normal 0x01 reverse 0x00 initial normal
+        point3 0x01 segment seg10 normal 0x01 reverse 0x00 initial normal
+        point4 0x02 segment seg23 normal 0x01 reverse 0x00 initial normal
+        point5 0x03 segment seg24 normal 0x01 reverse 0x00 initial normal
+        point7 0x04 segment seg19 normal 0x01 reverse 0x00 initial normal
+        point8 0x05 segment seg18 normal 0x01 reverse 0x00 initial normal
+    end
+
+    points onecontrol2
+        point1 0x00 segment seg2 normal 0x01 reverse 0x00 initial normal
+        point6 0x01 segment seg14 normal 0x01 reverse 0x00 initial normal
+        point9 0x02 segment seg25 normal 0x01 reverse 0x00 initial normal
+        point10 0x03 segment seg26 normal 0x01 reverse 0x00 initial normal
+        point11 0x04 segment seg33 normal 0x01 reverse 0x00 initial normal
+        point12 0x05 segment seg34 normal 0x01 reverse 0x00 initial normal
+    end
+
+    peripherals onecontrol1
+        onebit sync1 0x06 port 0x0027      # Exact port address is not essential for output-only behaviour
+        onebit lanterns1 0x07 port 0x0018  # Exact port address is not essential for output-only behaviour
+    end
+
+    peripherals onecontrol2
+        onebit sync2 0x06 port 0x0027
+        onebit lanterns2 0x07 port 0x0018  # Exact port address is not essential for output-only behaviour
+    end
+
+    blocks
+        # Anti-clockwise reading direction
+        
+        # blocks
+        block1 overlap seg3 main seg4 overlap seg5 limit 300km/h trains cargo passenger end
+        block2 overlap seg7 main seg8 overlap seg9 limit 350km/h
+        block3 overlap seg11 main seg12 overlap seg13 trains cargo end
+        block4 overlap seg15 main seg16 overlap seg17
+        block5 overlap seg27 main seg28 overlap seg29
+        block6 overlap seg20 main seg21 overlap seg22
+
+        # Kehrschleifenmodul: actively reverses the block's orientation.
+        block7 overlap seg30b main seg31 overlap seg32b
+
+        # buffers
+        buffer main seg1
+    end
+
+    crossings
+        crossing1 segment seg35
+    end
+
+    platforms
+        platform1 overlap seg36 main seg37 overlap seg38 reversed
+        platform2 overlap seg39 main seg40 overlap seg41 reversed
+    end
+
+    layout
+        # Anti-clockwise reading direction
+
+        # blocks
+        block1.down -- point1.stem
+        block1.up -- point2.straight
+
+        block2.down -- point2.stem
+        block2.up -- point3.stem
+
+        block3.down -- point3.straight
+        block3.up -- point6.stem
+
+        block4.down -- point6.side
+        block4.up -- point8.side
+
+        block5.down -- point10.straight
+        block5.up -- point7.stem
+
+        block6.down -- point7.straight
+        block6.up -- point4.straight
+
+        block7.down -- point10.side
+        block7.up -- point12.down2
+
+        platform2.down -- point12.up2
+
+        # crossings
+        crossing1.down1 -- point11.side
+        crossing1.down2 -- point12.up1
+        crossing1.up1 -- point5.side
+        crossing1.up2 -- platform1.down
+
+        # points
+        point1.straight -- buffer.up
+        point1.side -- point6.straight
+
+        point2.side -- point8.stem
+
+        point3.side -- point4.side
+
+        point4.stem -- point5.stem
+
+        point5.straight -- point9.straight
+
+        point7.side -- point8.straight
+
+        point9.stem -- point10.stem
+        point9.side -- point11.stem
+
+        point11.straight -- point12.down1
+
+        # signals
+        signal1 -- buffer.down
+        signal2 -- block1.down
+        signal3 -- block1.up
+        signal4 -- block2.down
+        signal5 -- block6.up
+        signal6 -- block2.up
+        signal7 -- block3.down
+        signal8 -- block3.up
+        signal9 -- block5.down
+        signal10 -- block4.down
+        signal11 -- block5.up
+        signal12 -- block4.up
+        signal13 -- block6.down
+        signal14 -- block7.down
+        signal15 -- block7.up
+        signal16 -- platform1.down
+        signal17 -- platform1.up
+        signal18 -- platform2.down
+        signal19 -- platform2.up
+    end
 
     trains
         cargo_db 0x007F  # addr high | addr low
-        steps 126 
-        calibration
-            5 
-            15 
-            30 
-            45 
-            60 
-            75 
-            90 
-            105 
-            120 
-        end 
-        weight 100g 
-        length 13cm 
-        type cargo
+            steps 126 
+            calibration
+                5 
+                15 
+                30 
+                45 
+                60 
+                75 
+                90 
+                105 
+                120 
+            end 
+            weight 77g 
+            length 13cm 
+            type cargo
         peripherals
             head_light 
                 bit 4        # a value in range 0..31
@@ -241,28 +241,38 @@ module SWTbahnStandard
                 bit 0        # a value in range 0..31
                 initial 1
         end
-        
-        cargo_bayern 0x0070 steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 100g length 13cm type cargo
+
+        cargo_bayern 0x0070 steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 72g length 13cm type cargo
         peripherals
             head_light bit 4 initial 1
             cabin_light bit 0 initial 1
         end
-        
-        cargo_green 0x006F steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 100g length 13cm type cargo
+
+        cargo_green 0x006F steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 80g length 13cm type cargo
         peripherals
             head_light bit 4 initial 1
         end
 
-        regional_odeg 0x0060 steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 100g length 25cm type passenger
+        regional_odeg 0x0060 steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 194g length 25cm type passenger
         peripherals
             head_light bit 4 initial 1
             cabin_light bit 0 initial 1
         end
-        
-        regional_brengdirect 0x005F steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 100g length 23cm type passenger
+
+        regional_brengdirect 0x005F steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 236g length 35cm type passenger
         peripherals
             head_light bit 4 initial 1
             cabin_light bit 0 initial 1
         end
+
+        cargo_g1000bb 0x0050 steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 35g length 10cm type cargo
+        peripherals
+            head_light bit 4 initial 1
+        end
+
+        perso_sbb 0x004F steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 81g length 12cm type passenger
+        peripherals
+            head_light bit 4 initial 1
+        end
     end
 end
diff --git a/configurations/swtbahn-ultraloop/bidib_train_config.yml b/configurations/swtbahn-ultraloop/bidib_train_config.yml
index 59b81014..cc62c5d3 100644
--- a/configurations/swtbahn-ultraloop/bidib_train_config.yml
+++ b/configurations/swtbahn-ultraloop/bidib_train_config.yml
@@ -20,7 +20,7 @@ trains:
       - id: cabin_light
         bit: 0
         initial: 1
-    weight: 100.0g
+    weight: 77.0g
     length: 13.0cm
     type: cargo
   - id: cargo_bayern
@@ -43,7 +43,7 @@ trains:
       - id: cabin_light
         bit: 0
         initial: 1
-    weight: 100.0g
+    weight: 72.0g
     length: 13.0cm
     type: cargo
   - id: cargo_green
@@ -63,7 +63,7 @@ trains:
       - id: head_light
         bit: 4
         initial: 1
-    weight: 100.0g
+    weight: 80.0g
     length: 13.0cm
     type: cargo
   - id: regional_odeg
@@ -86,7 +86,7 @@ trains:
       - id: cabin_light
         bit: 0
         initial: 1
-    weight: 100.0g
+    weight: 194.0g
     length: 25.0cm
     type: passenger
   - id: regional_brengdirect
@@ -109,6 +109,46 @@ trains:
       - id: cabin_light
         bit: 0
         initial: 1
-    weight: 100.0g
-    length: 23.0cm
+    weight: 236.0g
+    length: 35.0cm
+    type: passenger
+  - id: cargo_g1000bb
+    dcc-address: 0x0050
+    dcc-speed-steps: 126
+    calibration:
+      - 5
+      - 15
+      - 30
+      - 45
+      - 60
+      - 75
+      - 90
+      - 105
+      - 120
+    peripherals:
+      - id: head_light
+        bit: 4
+        initial: 1
+    weight: 35.0g
+    length: 10.0cm
+    type: cargo
+  - id: perso_sbb
+    dcc-address: 0x004F
+    dcc-speed-steps: 126
+    calibration:
+      - 5
+      - 15
+      - 30
+      - 45
+      - 60
+      - 75
+      - 90
+      - 105
+      - 120
+    peripherals:
+      - id: head_light
+        bit: 4
+        initial: 1
+    weight: 81.0g
+    length: 12.0cm
     type: passenger
diff --git a/configurations/swtbahn-ultraloop/config.bahn b/configurations/swtbahn-ultraloop/config.bahn
index 6a0c1813..bf95af73 100644
--- a/configurations/swtbahn-ultraloop/config.bahn
+++ b/configurations/swtbahn-ultraloop/config.bahn
@@ -93,21 +93,21 @@ module SWTbahnUltraloop
 	
     trains
         cargo_db 0x007F  # addr high | addr low
-        steps 126 
-        calibration
-            5 
-            15 
-            30 
-            45 
-            60 
-            75 
-            90 
-            105 
-            120 
-        end 
-        weight 100g 
-        length 13cm 
-        type cargo
+            steps 126 
+            calibration
+                5 
+                15 
+                30 
+                45 
+                60 
+                75 
+                90 
+                105 
+                120 
+            end 
+            weight 77g 
+            length 13cm 
+            type cargo
         peripherals
             head_light 
                 bit 4        # a value in range 0..31
@@ -116,28 +116,38 @@ module SWTbahnUltraloop
                 bit 0        # a value in range 0..31
                 initial 1
         end
-        
-        cargo_bayern 0x0070 steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 100g length 13cm type cargo
+
+        cargo_bayern 0x0070 steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 72g length 13cm type cargo
         peripherals
             head_light bit 4 initial 1
             cabin_light bit 0 initial 1
         end
-        
-        cargo_green 0x006F steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 100g length 13cm type cargo
+
+        cargo_green 0x006F steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 80g length 13cm type cargo
         peripherals
             head_light bit 4 initial 1
         end
 
-        regional_odeg 0x0060 steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 100g length 25cm type passenger
+        regional_odeg 0x0060 steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 194g length 25cm type passenger
         peripherals
             head_light bit 4 initial 1
             cabin_light bit 0 initial 1
         end
-        
-        regional_brengdirect 0x005F steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 100g length 23cm type passenger
+
+        regional_brengdirect 0x005F steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 236g length 35cm type passenger
         peripherals
             head_light bit 4 initial 1
             cabin_light bit 0 initial 1
         end
+
+        cargo_g1000bb 0x0050 steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 35g length 10cm type cargo
+        peripherals
+            head_light bit 4 initial 1
+        end
+
+        perso_sbb 0x004F steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 81g length 12cm type passenger
+        peripherals
+            head_light bit 4 initial 1
+        end
     end
 end
diff --git a/server/src/assets/client.html b/server/src/assets/client.html
index 34a2dc20..29f9342c 100644
--- a/server/src/assets/client.html
+++ b/server/src/assets/client.html
@@ -13,10 +13,12 @@
 	<script src="script-verificationtoggle.js"></script>
 
 	<title>SWTbahn Client</title>
+	<meta charset="utf-8" />
+	<meta name="viewport" content="width=device-width, initial-scale=1" />
 </head>
 
-<body style="margin: 20px">
-
+<body>
+	<!-- Head of page with Logo (set as background img via css) -->
 	<div class="row">
 		<div class="col-sm-6">
 			<div id="swtLogo"></div>
@@ -26,353 +28,612 @@
 		</div>
 	</div>
 	<hr />
+	<!-- Cards with different control elements in 2 columns -->
+	<div class="row row-cols-1 row-cols-lg-2 g-4">
+		<div class="col">
+			<!-- Card for pinging/starting/stopping the server, and loading accessories -->
+			<div class="card stdCardPadMarg">
+				<h4 class="card-title">Server Interaction & Track Configuration</h4>
+				<div class="d-flex justify-content-between">
+					<button id="pingButton" class="btn btn-outline-primary halfWJustifyHelper">
+						Ping the SWTbahn Server
+					</button>
+					<div class="alert alert-info halfWJustifyHelper btnPaddingReplicate">
+						<span id="pingResponse" class="alignedSpanForLine">&nbsp;</span>
+					</div>
+				</div>
+				<div class="d-flex justify-content-between">
+					<button id="startupButton" class="btn btn-primary thirdWJustifyHelper">Startup</button>
+					<button id="shutdownButton" class="btn btn-danger thirdWJustifyHelper">Shutdown</button>
+					<div class="alert alert-info thirdWJustifyHelper btnPaddingReplicate">
+						<span id="startupShutdownResponse" class="alignedSpanForLine">&nbsp;</span>
+					</div>
+				</div>
+				<hr class="mx-3 my-2" />
+				<div class="d-flex justify-content-between tooltipLoad">
+					<button id="loadAccessoriesButton" class="btn btn-outline-primary halfWJustifyHelper">
+						Load points and signals
+					</button>
+					<div class="alert alert-info halfWJustifyHelper btnPaddingReplicate">
+						<span id="loadAccessoriesResponse" class="alignedSpanForLine">&nbsp;</span>
+					</div>
+					<span class="tooltiptext tooltip-top">
+						Replaces the default signals and points selectable in dropdowns on this page with the ones available on the platform being used.
+						Works only when server is running.
+					</span>
+				</div>
+			</div>
+
+			<!-- Card for the train driver role functionality -->
+			<div class="card stdCardPadMarg">
+				<h4 class="card-title">Train Driver</h4>
+				<div class="input-group mb-1">
+					<span class="input-group-text col-2" for="grabTrainId">Train</span>
+					<select id="grabTrainId" class="form-select">
+						<option>cargo_db</option>
+						<option>cargo_bayern</option>
+						<option>cargo_green</option>
+						<option>cargo_g1000bb</option>
+						<option>perso_sbb</option>
+						<option>regional_odeg</option>
+						<option>regional_brengdirect</option>
+					</select>
+					<span class="input-group-text col-2" for="grabEngine">Engine</span>
+					<select id="grabEngine" class="form-select">
+						<option>libtrain_engine_default (unremovable)</option>
+						<option>libtrain_engine_linear (unremovable)</option>
+					</select>
+				</div>
+				<div class="d-flex justify-content-between mb-2">
+					<button id="grabTrainButton" type="button" class="btn btn-outline-primary w-25">Grab Train</button>
+					<button id="releaseTrainButton" type="button" class="btn btn-outline-warning w-25">Release Train</button>
+					<span id="sessionGrabId" class="input-group-text">Session ID: 0, Grab ID: -1</span>
+				</div>
+				<div class="alert alert-info btnPaddingReplicate">
+					<span id="grabTrainResponse" class="alignedSpanForLine">&nbsp;</span>
+				</div>
+
+				<div class="input-group mb-2">
+					<span class="input-group-text">DCC Speed</span>
+					<input id="dccSpeed" type="number" class="form-control" min="0" max="126" value="0" />
+					<button id="speedPlus" type="button" class="btn btn-outline-primary">+</button>
+					<button id="speedMinus" type="button" class="btn btn-outline-primary">–</button>
+				</div>
+				<div class="d-flex justify-content-between mb-2">
+					<button id="driveTrainButton" type="button" class="btn btn-outline-primary w-25" >Drive</button>
+					<button id="stopTrainButton" type="button" class="btn btn-outline-danger w-25" >Stop</button>
+					<button id="swapDirection" type="button" class="btn btn-outline-info w-25" >Swap Direction</button>
+				</div>
+				<div class="alert alert-info btnPaddingReplicate">
+					<span id="driveTrainResponse" class="alignedSpanForLine">&nbsp;</span>
+				</div>
+
+				<div class="d-flex justify-content-between mb-2">
+					<div class="input-group">
+						<span class="input-group-text col-4">From</span>
+						<select id="signalIdFrom" class="form-select">
+							<option>signal1</option>
+							<option>signal2</option>
+							<option>signal3</option>
+							<option>signal4</option>
+							<option>signal4a</option>
+							<option>signal4b</option>
+							<option>signal5</option>
+							<option>signal6</option>
+							<option>signal7</option>
+							<option>signal7a</option>
+							<option>signal7b</option>
+							<option>signal8</option>
+							<option>signal9</option>
+							<option>signal10</option>
+							<option>signal11</option>
+							<option>signal12</option>
+							<option>signal13</option>
+							<option>signal14</option>
+							<option>signal15</option>
+							<option>signal16</option>
+							<option>signal17</option>
+							<option>signal18</option>
+							<option>signal18a</option>
+							<option>signal18b</option>
+							<option>signal19</option>
+							<option>signal20</option>
+							<option>signal21</option>
+							<option>signal22</option>
+							<option>signal22a</option>
+							<option>signal22b</option>
+							<option>signal23</option>
+							<option>signal24</option>
+							<option>signal25</option>
+							<option>signal26</option>
+							<option>signal27</option>
+							<option>signal28</option>
+							<option>signal29</option>
+							<option>signal30</option>
+							<option>signal31</option>
+							<option>signal32</option>
+							<option>signal33</option>
+							<option>signal34</option>
+							<option>signal35</option>
+							<option>signal35a</option>
+							<option>signal35b</option>
+							<option>signal36</option>
+							<option>signal37</option>
+							<option>signal38</option>
+							<option>signal39</option>
+							<option>signal40</option>
+							<option>signal41</option>
+							<option>signal42</option>
+							<option>signal43</option>
+							<option>signal44</option>
+							<option>signal45</option>
+							<option>signal46</option>
+							<option>signal46a</option>
+							<option>signal46b</option>
+							<option>signal47</option>
+							<option>signal48</option>
+							<option>signal48a</option>
+							<option>signal48b</option>
+							<option>signal49</option>
+							<option>signal50</option>
+							<option>signal50a</option>
+							<option>signal50b</option>
+							<option>signal51</option>
+							<option>signal52</option>
+							<option>signal53</option>
+							<option>signal53a</option>
+							<option>signal53b</option>
+						</select>
+					</div>
+					<div class="input-group">
+						<span class="input-group-text col-3">To</span>
+						<select id="signalIdTo" class="form-select">
+							<option>signal1</option>
+							<option>signal2</option>
+							<option>signal3</option>
+							<option>signal4</option>
+							<option>signal4a</option>
+							<option>signal4b</option>
+							<option>signal5</option>
+							<option>signal6</option>
+							<option>signal7</option>
+							<option>signal7a</option>
+							<option>signal7b</option>
+							<option>signal8</option>
+							<option>signal9</option>
+							<option>signal10</option>
+							<option>signal11</option>
+							<option>signal12</option>
+							<option>signal13</option>
+							<option>signal14</option>
+							<option>signal15</option>
+							<option>signal16</option>
+							<option>signal17</option>
+							<option>signal18</option>
+							<option>signal18a</option>
+							<option>signal18b</option>
+							<option>signal19</option>
+							<option>signal20</option>
+							<option>signal21</option>
+							<option>signal22</option>
+							<option>signal22a</option>
+							<option>signal22b</option>
+							<option>signal23</option>
+							<option>signal24</option>
+							<option>signal25</option>
+							<option>signal26</option>
+							<option>signal27</option>
+							<option>signal28</option>
+							<option>signal29</option>
+							<option>signal30</option>
+							<option>signal31</option>
+							<option>signal32</option>
+							<option>signal33</option>
+							<option>signal34</option>
+							<option>signal35</option>
+							<option>signal35a</option>
+							<option>signal35b</option>
+							<option>signal36</option>
+							<option>signal37</option>
+							<option>signal38</option>
+							<option>signal39</option>
+							<option>signal40</option>
+							<option>signal41</option>
+							<option>signal42</option>
+							<option>signal43</option>
+							<option>signal44</option>
+							<option>signal45</option>
+							<option>signal46</option>
+							<option>signal46a</option>
+							<option>signal46b</option>
+							<option>signal47</option>
+							<option>signal48</option>
+							<option>signal48a</option>
+							<option>signal48b</option>
+							<option>signal49</option>
+							<option>signal50</option>
+							<option>signal50a</option>
+							<option>signal50b</option>
+							<option>signal51</option>
+							<option>signal52</option>
+							<option>signal53</option>
+							<option>signal53a</option>
+							<option>signal53b</option>
+						</select>
+					</div>
+
+					<div class="input-group">
+						<span class="input-group-text col-5">Route ID</span>
+						<input id="routeId" type="text" class="form-control" readonly value="None" />
+					</div>
+				</div>
+
+				<div class="d-flex justify-content-between mb-2">
+					<button id="requestRouteButton" type="button" class="btn btn-outline-primary w-20 m-auto">
+						Request Route
+					</button>
+					<button id="releaseRouteButton" type="button" class="btn btn-outline-danger w-20 m-auto">
+						Release Route
+					</button>
+					<button id="automaticDriveRouteButton" type="button" class="btn btn-outline-primary px-0 w-20 m-auto">
+						Automatic Drive Route
+					</button>
+					<button id="manualDriveRouteButton" type="button" class="btn btn-outline-primary w-20 m-auto">
+						Manual Drive Route
+					</button>
+				</div>
+				<div class="alert alert-info btnPaddingReplicate" style="margin-bottom: 0.3rem;">
+					<span id="routeResponse" class="alignedSpanForLine">&nbsp;</span>
+				</div>
+			</div>
+
+			<!-- Card for admin overview and control of trains -->
+			<div class="card stdCardPadMarg">
+				<h4 class="card-title">Train Status Overview/Admin Control</h4>
+				<ul>
+					<li>
+						<div class="d-flex justify-content-between overviewTrainLineContainer">
+							<label class="w-25 btnPaddingReplicateYOnly overviewTrainLineElem">cargo_db</label>
+							<div class="w-50 col">
+								<label class="btnPaddingReplicate overviewTrainLineElem" for="dccSpeed_cargo_db">Speed: </label>
+								<input id="dccSpeed_cargo_db" class="overviewSpeedInput overviewTrainLineElem smallerLineHeight" type="number" min="-126" max="126"/> 
+								<button id="driveTrainButton_cargo_db" type="button" class="btn btn-outline-primary overviewTrainLineElem smallerLineHeight">
+									Set Speed
+								</button> 
+								<button id="releaseTrainButton_cargo_db" type="button" class="btn btn-outline-primary overviewTrainLineElem smallerLineHeight">
+									Release
+								</button>
+							</div>
+						</div>
+					</li>
+					<li>
+						<div class="d-flex justify-content-between overviewTrainLineContainer">
+							<label class="w-25 btnPaddingReplicateYOnly overviewTrainLineElem">cargo_bayern</label>
+							<div class="w-50 col">
+								<label class="btnPaddingReplicate overviewTrainLineElem" for="dccSpeed_cargo_bayern">Speed: </label>
+								<input id="dccSpeed_cargo_bayern" class="overviewSpeedInput overviewTrainLineElem smallerLineHeight" type="number" min="-126" max="126"/> 
+								<button id="driveTrainButton_cargo_bayern" type="button" class="btn btn-outline-primary overviewTrainLineElem smallerLineHeight">
+									Set Speed
+								</button> 
+								<button id="releaseTrainButton_cargo_bayern" type="button" class="btn btn-outline-primary overviewTrainLineElem smallerLineHeight">
+									Release
+								</button>
+							</div>
+						</div>
+					</li>
+					<li>
+						<div class="d-flex justify-content-between overviewTrainLineContainer">
+							<label class="w-25 btnPaddingReplicateYOnly overviewTrainLineElem">cargo_green</label>
+							<div class="w-50 col">
+								<label class="btnPaddingReplicate overviewTrainLineElem" for="dccSpeed_cargo_green">Speed: </label>
+								<input id="dccSpeed_cargo_green" class="overviewSpeedInput overviewTrainLineElem smallerLineHeight" type="number" min="-126" max="126"/> 
+								<button id="driveTrainButton_cargo_green" type="button" class="btn btn-outline-primary overviewTrainLineElem smallerLineHeight">
+									Set Speed
+								</button> 
+								<button id="releaseTrainButton_cargo_green" type="button" class="btn btn-outline-primary overviewTrainLineElem smallerLineHeight">
+									Release
+								</button>
+							</div>
+						</div>
+					</li>
+					<li>
+						<div class="d-flex justify-content-between overviewTrainLineContainer">
+							<label class="w-25 btnPaddingReplicateYOnly overviewTrainLineElem">cargo_g1000bb</label>
+							<div class="w-50 col">
+								<label class="btnPaddingReplicate overviewTrainLineElem" for="dccSpeed_cargo_g1000bb">Speed: </label>
+								<input id="dccSpeed_cargo_g1000bb" class="overviewSpeedInput overviewTrainLineElem smallerLineHeight" type="number" min="-126" max="126"/> 
+								<button id="driveTrainButton_cargo_g1000bb" type="button" class="btn btn-outline-primary overviewTrainLineElem smallerLineHeight">
+									Set Speed
+								</button> 
+								<button id="releaseTrainButton_cargo_g1000bb" type="button" class="btn btn-outline-primary overviewTrainLineElem smallerLineHeight">
+									Release
+								</button>
+							</div>
+						</div>
+					</li>
+					<li>
+						<div class="d-flex justify-content-between overviewTrainLineContainer">
+							<label class="w-25 btnPaddingReplicateYOnly overviewTrainLineElem">perso_sbb</label>
+							<div class="w-50 col">
+								<label class="btnPaddingReplicate overviewTrainLineElem" for="dccSpeed_perso_sbb">Speed: </label>
+								<input id="dccSpeed_perso_sbb" class="overviewSpeedInput overviewTrainLineElem smallerLineHeight" type="number" min="-126" max="126"/> 
+								<button id="driveTrainButton_perso_sbb" type="button" class="btn btn-outline-primary overviewTrainLineElem smallerLineHeight">
+									Set Speed
+								</button> 
+								<button id="releaseTrainButton_perso_sbb" type="button" class="btn btn-outline-primary overviewTrainLineElem smallerLineHeight">
+									Release
+								</button>
+							</div>
+						</div>
+					</li>
+					<li>
+						<div class="d-flex justify-content-between overviewTrainLineContainer">
+							<label class="w-25 btnPaddingReplicateYOnly overviewTrainLineElem">regional_odeg</label>
+							<div class="w-50 col">
+								<label class="btnPaddingReplicate overviewTrainLineElem" for="dccSpeed_regional_odeg">Speed: </label>
+								<input id="dccSpeed_regional_odeg" class="overviewSpeedInput overviewTrainLineElem smallerLineHeight" type="number" min="-126" max="126"/> 
+								<button id="driveTrainButton_regional_odeg" type="button" class="btn btn-outline-primary overviewTrainLineElem smallerLineHeight">
+									Set Speed
+								</button> 
+								<button id="releaseTrainButton_regional_odeg" type="button" class="btn btn-outline-primary overviewTrainLineElem smallerLineHeight">
+									Release
+								</button>
+							</div>
+						</div>
+					</li>
+					<li>
+						<div class="d-flex justify-content-between overviewTrainLineContainer">
+							<label class="w-25 btnPaddingReplicateYOnly overviewTrainLineElem">regional_brengdirect</label>
+							<div class="w-50 col">
+								<label class="btnPaddingReplicate overviewTrainLineElem" for="dccSpeed_regional_brengdirect">Speed: </label>
+								<input id="dccSpeed_regional_brengdirect" class="overviewSpeedInput overviewTrainLineElem smallerLineHeight" type="number" min="-126" max="126"/> 
+								<button id="driveTrainButton_regional_brengdirect" type="button" class="btn btn-outline-primary overviewTrainLineElem smallerLineHeight">
+									Set Speed
+								</button> 
+								<button id="releaseTrainButton_regional_brengdirect" type="button" class="btn btn-outline-primary overviewTrainLineElem smallerLineHeight">
+									Release
+								</button>
+							</div>
+						</div>
+					</li>
+				</ul>
+			</div>
+		</div>
 
-	<h1>Configuration</h1>
-
-	<label>Track Output:</label>
-	<input type="text" id=trackOutput value="master" />
-	<button id=configButton>Configure</button>
-	<span id=configResponse></span>
-	<br />
-	<br />
-
-	<button id=pingButton>Ping SWTbahn Server</button>
-	<div class="alert" style="padding: 4px; display: inline;">
-		<span id=pingResponse></span>
-	</div>
-	<br />
-
-	<button id=startupButton>Startup</button>
-	<button id=shutdownButton>Shutdown</button>
-	<div class="alert" style="padding: 4px; display: inline;">
-		<span id=startupShutdownResponse></span>
-	</div>
-	<br />
-	<br />
-
-	<span id=sessionGrabId>Session ID: 0, Grab ID: -1</span>
-	<br />
-	<br />
-
-
-	<h1>Train Driver</h1>
-
-	<label>Train:</label>
-	<select id=grabTrainId>
-		<option>cargo_db</option>
-		<option>cargo_bayern</option>
-		<option>cargo_green</option>
-		<option>regional_odeg</option>
-		<option>regional_brengdirect</option>
-	</select>
-	<label>Engine:</label>
-	<select id=grabEngine>
-		<option>libtrain_engine_default (unremovable)</option>
-		<option>libtrain_engine_linear (unremovable)</option>
-	</select>
-	<button id=grabTrainButton>Grab</button>
-	<button id=releaseTrainButton>Release</button>
-	<div class="alert" style="padding: 4px; display: inline;">
-		<span id=grabTrainResponse></span>
-	</div>
-	<br />
-
-	<label>DCC Speed:</label>
-	<input type="text" id=dccSpeed value="10" />
-	<button id=swapDirection>Swap Direction</button>
-	<button id=driveTrainButton>Drive</button>
-	<button id=stopTrainButton>Stop</button>
-	<div class="alert" style="padding: 4px; display: inline;">
-		<span id=driveTrainResponse></span>
-	</div>
-	<br />
-
-	<label>Route:</label>
-	<input type="text" id=signalIdFrom value="signal" />
-	<label>to</label>
-	<input type="text" id=signalIdTo value="signal" />
-	<button id=requestRouteButton>Request</button>
-	<button id=automaticDriveRouteButton>Automatic Drive Route</button>
-	<button id=manualDriveRouteButton>Manual Drive Route</button>
-	<div class="alert" style="padding: 4px; display: inline;">
-		<span id=routeResponse></span>
-	</div>
-	<br />
-	<br />
-	
-	<label>Grabbed statuses:</label>
-	<ul>
-		<li>
-			cargo_db 
-			<input type="text" id=dccSpeed_cargo_db /> 
-			<button id=driveTrainButton_cargo_db>Drive</button> 
-			<button id=releaseTrainButton_cargo_db>Release</button>
-		</li>
-		<li>
-			cargo_green 
-			<input type="text" id=dccSpeed_cargo_green /> 
-			<button id=driveTrainButton_cargo_green>Drive</button> 
-			<button id=releaseTrainButton_cargo_green>Release</button>
-		<li>
-			cargo_bayern 
-			<input type="text" id=dccSpeed_cargo_bayern /> 
-			<button id=driveTrainButton_cargo_bayern>Drive</button> 
-			<button id=releaseTrainButton_cargo_bayern>Release</button>
-		</li>
-		<li>
-			regional_odeg 
-			<input type="text" id=dccSpeed_regional_odeg /> 
-			<button id=driveTrainButton_regional_odeg>Drive</button> 
-			<button id=releaseTrainButton_regional_odeg>Release</button>
-		</li>
-		<li>
-			regional_brengdirect
-			<input type="text" id=dccSpeed_regional_brengdirec t/> 
-			<button id=driveTrainButton_regional_brengdirect>Drive</button> 
-			<button id=releaseTrainButton_regional_brengdirect>Release</button>
-		</li>
-	</ul>
-	
-	<br />
-		
-
-	<h1>Controller</h1>
-
-	<label>Release Route:</label>
-	<input type="text" id=routeId value="None" />
-	<button id=releaseRouteButton>Release</button>
-	<br />
-
-	<label>Point:</label>
-	<select id=pointId>
-		<option>point1</option>
-		<option>point2</option>
-		<option>point3</option>
-		<option>point4</option>
-		<option>point5</option>
-		<option>point6</option>
-		<option>point7</option>
-		<option>point8</option>
-		<option>point9</option>
-		<option>point10</option>
-		<option>point11</option>
-		<option>point12</option>
-		<option>point13</option>
-		<option>point14</option>
-		<option>point15</option>
-		<option>point16</option>
-		<option>point17</option>
-		<option>point18a</option>
-		<option>point18b</option>
-		<option>point19</option>
-		<option>point20</option>
-		<option>point21</option>
-		<option>point22</option>
-		<option>point23</option>
-		<option>point24</option>
-		<option>point25</option>
-		<option>point26</option>
-		<option>point27</option>
-		<option>point28</option>
-		<option>point29</option>
-	</select>
-	<label>Position:</label>
-	<select id=pointPosition>
-		<option>normal</option>
-		<option>reverse</option>
-	</select>
-	<button id=setPointButton>Set</button>
-	<div class="alert" style="padding: 4px; display: inline;">
-		<span id=setPointResponse></span>
-	</div>
-	<br />
-
-	<label>Signal:</label>
-	<select id=signalId>
-		<option>signal1</option>
-		<option>signal2</option>
-		<option>signal3</option>
-		<option>signal4</option>
-		<option>signal4a</option>
-		<option>signal4b</option>
-		<option>signal5</option>
-		<option>signal6</option>
-		<option>signal7</option>
-		<option>signal7a</option>
-		<option>signal7b</option>
-		<option>signal8</option>
-		<option>signal9</option>
-		<option>signal10</option>
-		<option>signal11</option>
-		<option>signal12</option>
-		<option>signal13</option>
-		<option>signal14</option>
-		<option>signal15</option>
-		<option>signal16</option>
-		<option>signal17</option>
-		<option>signal18</option>
-		<option>signal18a</option>
-		<option>signal18b</option>
-		<option>signal19</option>
-		<option>signal20</option>
-		<option>signal21</option>
-		<option>signal22</option>
-		<option>signal22a</option>
-		<option>signal22b</option>
-		<option>signal23</option>
-		<option>signal24</option>
-		<option>signal25</option>
-		<option>signal26</option>
-		<option>signal27</option>
-		<option>signal28</option>
-		<option>signal29</option>
-		<option>signal30</option>
-		<option>signal31</option>
-		<option>signal32</option>
-		<option>signal33</option>
-		<option>signal34</option>
-		<option>signal35</option>
-		<option>signal35a</option>
-		<option>signal35b</option>
-		<option>signal36</option>
-		<option>signal37</option>
-		<option>signal38</option>
-		<option>signal39</option>
-		<option>signal40</option>
-		<option>signal41</option>
-		<option>signal42</option>
-		<option>signal43</option>
-		<option>signal44</option>
-		<option>signal45</option>
-		<option>signal46</option>
-		<option>signal46a</option>
-		<option>signal46b</option>
-		<option>signal47</option>
-		<option>signal48</option>
-		<option>signal48a</option>
-		<option>signal48b</option>
-		<option>signal49</option>
-		<option>signal50</option>
-		<option>signal50a</option>
-		<option>signal50b</option>
-		<option>signal51</option>
-		<option>signal52</option>
-		<option>signal53</option>
-		<option>signal53a</option>
-		<option>signal53b</option>
-		<option>platformlight1</option>
-		<option>platformlight2</option>
-		<option>platformlight4a</option>
-		<option>platformlight4b</option>
-		<option>platformlights</option>
-	</select>
-	<label>Aspect:</label>
-	<select id=signalAspect>
-		<option>aspect_stop</option>
-		<option>aspect_go</option>
-		<option>aspect_caution</option>
-		<option>aspect_shunt</option>
-	</select>
-	<button id=setSignalButton>Set</button>
-	<div class="alert" style="padding: 4px; display: inline;">
-		<span id=setSignalResponse></span>
-	</div>
-	<br />
-	
-	<label>Peripheral:</label>
-	<input id=peripheralId>
-	<label>Aspect:</label>
-	<input id=peripheralState>
-	<button id=setPeripheralStateButton>Set</button>
-	<div class="alert" style="padding: 4px; display: inline;">
-		<span id=setPeripheralResponse></span>
-	</div>
-	<br />
-	<br />
-	
-	<label>Granted routes:</label>
-	<ul id=grantedRoutes></ul>
-	
-	<br />
-
-
-	<h1>Custom Engines and Interlockers</h1>
-	
-	<label>SCCharts (*.sctx) or Bahn (*.bahn) File:</label>
-	<input type="file" id=selectUploadFile accept=".sctx,.bahn" />
-	<br />
-	<button id=uploadEngineButton>Upload SCCharts</button>
-	<button id="uploadInterlockerButton">Upload Bahn</button>	 
-	<div class="alert" style="padding: 4px; display: inline;">
-		<span id=uploadResponse></span>
-	</div>
-	<br />
-	<br/>
-	
-	<label>Available Engines:</label>
-	<select id=availableEngines>
-		<option>libtrain_engine_default (unremovable)</option>
-		<option>libtrain_engine_linear (unremovable)</option>
-	</select>
-	<button id=refreshEnginesButton>Refresh</button>
-	<button id=removeEngineButton>Remove</button>
-	<div class="alert" style="padding: 4px; display: inline;">
-		<span id=refreshRemoveEngineResponse></span>
-	</div>
-	<br />
-
-	<label>Available Interlockers:</label>
-	<select id="availableInterlockers">
-		<option>libinterlocker_default (unremovable)</option>
-		<option>libinterlocker_simple_sectional (unremovable)</option>
-	</select>
-	<button id="unsetInterlockerButton">Unset</button>
-	<button id="setInterlockerButton">Set</button>
-	<button id="refreshInterlockersButton">Refresh</button>
-	<button id="removeInterlockerButton">Remove</button>
-	<div class="alert" style="padding: 4px; display: inline;">
-		<span id="refreshRemoveInterlockerResponse"></span>
-	</div>
-	<br />
-	
-	<label>Interlocker in use:</label>
-	<span id="interlockerInUse">libinterlocker_default (unremovable)</span>
-	<br />
-	
-	<br />
-	
-	
-	<h1>Verification</h1>
-	
-	<label style="line-height: 2em">Verification for Train Engines:</label>
-	<input id="verificationToggle" type="checkbox" />
-	<div class="alert" style="padding: 4px; display: inline;">
-		<span id=verificationSettingResponse></span>
-	</div>
-	<br />
-
-	<label>Verification Server URL:</label>
-	<input type="url" id=verificationServerUrlInput />
-	<button id="setVerificationServerUrlButton">Set</button>
-	<div class="alert" style="padding: 4px; display: inline;">
-		<span id=setVerificationServerUrlResponse></span>
+		<div class="col">
+			<!-- Card for Controller/Stellwerk role functionality -->
+			<div class="card stdCardPadMarg">
+				<h4 class="card-title">Controller/Stellwerk</h4>
+				<div class="input-group mb-2">
+					<label class="input-group-text col-2">Point:</label>
+					<select id="pointId" class="form-select">
+						<option>point1</option>
+						<option>point2</option>
+						<option>point3</option>
+						<option>point4</option>
+						<option>point5</option>
+						<option>point6</option>
+						<option>point7</option>
+						<option>point8</option>
+						<option>point9</option>
+						<option>point10</option>
+						<option>point11</option>
+						<option>point12</option>
+						<option>point13</option>
+						<option>point14</option>
+						<option>point15</option>
+						<option>point16</option>
+						<option>point17</option>
+						<option>point18a</option>
+						<option>point18b</option>
+						<option>point19</option>
+						<option>point20</option>
+						<option>point21</option>
+						<option>point22</option>
+						<option>point23</option>
+						<option>point24</option>
+						<option>point25</option>
+						<option>point26</option>
+						<option>point27</option>
+						<option>point28</option>
+						<option>point29</option>
+					</select>
+					<label class="input-group-text col-2">Position:</label>
+					<select id="pointPosition" class="form-select">
+						<option>normal</option>
+						<option>reverse</option>
+					</select>
+					<button id="setPointButton" class="btn btn-outline-primary">Set</button>
+				</div>
+				<div class="alert alert-info btnPaddingReplicate">
+					<span id="setPointResponse" class="alignedSpanForLine">&nbsp;</span>
+				</div>
+				<div class="input-group mb-2">
+					<label class="input-group-text col-2">Signal:</label>
+					<select id="signalId" class="form-select">
+						<option>signal1</option>
+						<option>signal2</option>
+						<option>signal3</option>
+						<option>signal4</option>
+						<option>signal4a</option>
+						<option>signal4b</option>
+						<option>signal5</option>
+						<option>signal6</option>
+						<option>signal7</option>
+						<option>signal7a</option>
+						<option>signal7b</option>
+						<option>signal8</option>
+						<option>signal9</option>
+						<option>signal10</option>
+						<option>signal11</option>
+						<option>signal12</option>
+						<option>signal13</option>
+						<option>signal14</option>
+						<option>signal15</option>
+						<option>signal16</option>
+						<option>signal17</option>
+						<option>signal18</option>
+						<option>signal18a</option>
+						<option>signal18b</option>
+						<option>signal19</option>
+						<option>signal20</option>
+						<option>signal21</option>
+						<option>signal22</option>
+						<option>signal22a</option>
+						<option>signal22b</option>
+						<option>signal23</option>
+						<option>signal24</option>
+						<option>signal25</option>
+						<option>signal26</option>
+						<option>signal27</option>
+						<option>signal28</option>
+						<option>signal29</option>
+						<option>signal30</option>
+						<option>signal31</option>
+						<option>signal32</option>
+						<option>signal33</option>
+						<option>signal34</option>
+						<option>signal35</option>
+						<option>signal35a</option>
+						<option>signal35b</option>
+						<option>signal36</option>
+						<option>signal37</option>
+						<option>signal38</option>
+						<option>signal39</option>
+						<option>signal40</option>
+						<option>signal41</option>
+						<option>signal42</option>
+						<option>signal43</option>
+						<option>signal44</option>
+						<option>signal45</option>
+						<option>signal46</option>
+						<option>signal46a</option>
+						<option>signal46b</option>
+						<option>signal47</option>
+						<option>signal48</option>
+						<option>signal48a</option>
+						<option>signal48b</option>
+						<option>signal49</option>
+						<option>signal50</option>
+						<option>signal50a</option>
+						<option>signal50b</option>
+						<option>signal51</option>
+						<option>signal52</option>
+						<option>signal53</option>
+						<option>signal53a</option>
+						<option>signal53b</option>
+						<option>platformlight1</option>
+						<option>platformlight2</option>
+						<option>platformlight4a</option>
+						<option>platformlight4b</option>
+						<option>platformlights</option>
+					</select>
+					<label class="input-group-text col-2">Aspect:</label>
+					<select id="signalAspect" class="form-select">
+						<option>aspect_stop</option>
+						<option>aspect_go</option>
+						<option>aspect_caution</option>
+						<option>aspect_shunt</option>
+					</select>
+					<button id="setSignalButton" class="btn btn-outline-primary">Set</button>
+				</div>
+				<div class="alert alert-info btnPaddingReplicate">
+					<span id="setSignalResponse" class="alignedSpanForLine">&nbsp;</span>
+				</div>
+				<div class="input-group mb-2">
+					<label class="input-group-text">Peripheral:</label>
+					<input id="peripheralId" class="form-control">
+					<label class="input-group-text">Aspect:</label>
+					<input id="peripheralState" class="form-control">
+					<button id="setPeripheralStateButton" class="btn btn-outline-primary">Set</button>
+				</div>
+				<div class="alert alert-info btnPaddingReplicate">
+					<span id="setPeripheralResponse" class="alignedSpanForLine">&nbsp;</span>
+				</div>
+				<label>Granted routes:</label>
+				<ul id="grantedRoutes"></ul>
+			</div>
+
+			<!-- Card for Upload role (engines and interlocker uploading etc.) -->
+			<div class="card stdCardPadMarg">
+				<h4 class="card-title">Custom Engines and Interlockers</h4>
+				<div class="input-group mb-2">
+					<label class="input-group-text">SCCharts (*.sctx) or Bahn (*.bahn) File:</label>
+					<input id="selectUploadFile" type="file" class="form-control" accept=".sctx,.bahn" />
+					<button id="uploadEngineButton" class="btn btn-outline-primary">Upload SCCharts</button>
+					<button id="uploadInterlockerButton" class="btn btn-outline-primary">Upload Bahn</button>	 
+				</div>
+				<div class="alert alert-info btnPaddingReplicate">
+					<span id="uploadResponse" class="alignedSpanForLine">&nbsp;</span>
+				</div>
+				<div class="input-group mb-2">
+					<label class="input-group-text">Available Engines:</label>
+					<select id="availableEngines" class="form-select">
+						<option>libtrain_engine_default (unremovable)</option>
+						<option>libtrain_engine_linear (unremovable)</option>
+					</select>
+					<button id="refreshEnginesButton" class="btn btn-outline-primary">Refresh</button>
+					<button id="removeEngineButton" class="btn btn-outline-danger">Remove</button>
+				</div>
+				<div class="alert alert-info btnPaddingReplicate">
+					<span id="refreshRemoveEngineResponse" class="alignedSpanForLine">&nbsp;</span>
+				</div>
+				
+				<div class="input-group mb-2">
+					<label class="input-group-text">Available Interlockers:</label>
+					<select id="availableInterlockers" class="form-select w-30">
+						<option>libinterlocker_default (unremovable)</option>
+						<option>libinterlocker_simple_sectional (unremovable)</option>
+					</select>
+					<button id="setInterlockerButton" class="btn btn-outline-primary">Set</button>
+					<button id="unsetInterlockerButton" class="btn btn-outline-warning">Unset</button>
+					<button id="refreshInterlockersButton" class="btn btn-outline-primary">Refresh List</button>
+					<button id="removeInterlockerButton" class="btn btn-outline-danger">Remove</button>
+				</div>
+				<div class="alert alert-info btnPaddingReplicate">
+					<span id="refreshRemoveInterlockerResponse" class="alignedSpanForLine">&nbsp;</span>
+				</div>
+				<div class="input-group mb-2">
+					<label class="input-group-text">Interlocker in use:</label>
+					<span id="interlockerInUse" class="input-group-text">libinterlocker_default (unremovable)</span>
+				</div>
+			</div>
+			<div class="card stdCardPadMarg">
+				<h4 class="card-title">Verification</h4>
+				<div class="d-flex justify-content-between">
+					<div class="form-check mb-2 mx-1">
+						<input id="verificationToggle" class="form-check-input" type="checkbox" />
+						<label class="form-check-label btnPaddingReplicateYOnly" for="verificationToggle">Verification for Train Engines</label>
+					</div>
+					<div class="alert alert-info btnPaddingReplicate halfWJustifyHelper">
+						<span id="verificationSettingResponse" class="alignedSpanForLine">&nbsp;</span>
+					</div>
+				</div>
+				<div class="input-group mb-2">
+					<label class="input-group-text">Verification Server URL:</label>
+					<input id="verificationServerUrlInput" type="url" class="form-control" />
+					<button id="setVerificationServerUrlButton" class="btn btn-outline-primary">Set</button>
+				</div>
+				<div class="alert alert-info">
+					<span id="setVerificationServerUrlResponse" class="alignedSpanForLine">&nbsp;</span>
+				</div>
+				<div class="input-group mb-2">
+					<label class="input-group-text">Current Verification Server URL:</label>
+					<span id="verificationUrlInUse" class="input-group-text"></span>
+				</div>
+			</div>
+		</div>
 	</div>
-	<br />
-	
-	<label>Current Verification Server URL:</label>
-	<span id="verificationUrlInUse"></span>
-	<br />
-	
 </body>
 
 <script type="text/javascript">
-	const trainStatusTimeout = 500;
+	const trainStatusTimeout = 2000;
 	const trainStatusInterval = setInterval(() => {
 		updateTrainGrabbedState();
 	}, trainStatusTimeout);
 
 
-	const grantedRoutesTimeout = 500;
+	const grantedRoutesTimeout = 2000;
 	const grantedRoutesInterval = setInterval(() => {
 		updateGrantedRoutes($('#grantedRoutes'));
 	}, grantedRoutesTimeout);
diff --git a/server/src/assets/controller.html b/server/src/assets/controller.html
index 6e4eb3b4..6695e8c4 100644
--- a/server/src/assets/controller.html
+++ b/server/src/assets/controller.html
@@ -29,252 +29,227 @@
 
 	<div class="row row-cols-1 row-cols-lg-2 g-4">
 		<div class="col">
-			<div class="card">
+			<div class="card stdCardPadMarg">
 				<div class="card-body">
-					<h3 class="card-title"> System</h3>
-
-					<div>
-						<button id=pingButton type="button" class="btn btn-outline-primary">Ping SWTbahn Server</button>
-					</div>
-					<br />
-					<div class="alert alert-info" role="alert">
-						<span id=pingResponse></span>
+					<h4 class="card-title">System</h4>
+					<div class="d-flex justify-content-between">
+						<button id="pingButton" class="btn btn-outline-primary halfWJustifyHelper">
+							Ping the SWTbahn Server
+						</button>
+						<div class="alert alert-info halfWJustifyHelper btnPaddingReplicate">
+							<span id="pingResponse" class="alignedSpanForLine">&nbsp;</span>
+						</div>
 					</div>
-
-					<br />
-
 					<div class="d-flex justify-content-between">
-						<button id=startupButton type="button" class="btn btn-outline-primary" style="width: 49%">Startup</button>
-						<button id=shutdownButton type="button" class="btn btn-outline-primary" style="width: 49%">Shutdown</button>
+						<button id="startupButton" class="btn btn-primary thirdWJustifyHelper">Startup</button>
+						<button id="shutdownButton" class="btn btn-danger thirdWJustifyHelper">Shutdown</button>
+						<div class="alert alert-info thirdWJustifyHelper btnPaddingReplicate">
+							<span id="startupShutdownResponse" class="alignedSpanForLine">&nbsp;</span>
+						</div>
 					</div>
-					<br />
-					<div class="alert alert-info" role="alert">
-						<span id=startupShutdownResponse></span>
+					<hr class="mx-3 my-3" />
+					<div class="d-flex justify-content-between tooltipLoad">
+						<button id="loadAccessoriesButton" class="btn btn-outline-primary halfWJustifyHelper">
+							Load points and signals
+						</button>
+						<div class="alert alert-info halfWJustifyHelper btnPaddingReplicate">
+							<span id="loadAccessoriesResponse" class="alignedSpanForLine">&nbsp;</span>
+						</div>
+						<span class="tooltiptext tooltip-top">
+							Replaces the default signals and points selectable in dropdowns on this page with the ones available on the platform being used.
+							Works only when server is running.
+						</span>
 					</div>
-
-					<br />
-
-					<h3>Custom Interlocker</h3>
-					<div class="d-flex justify-content-between">
+				</div>
+			</div>
+			<div class="card stdCardPadMarg">
+				<div class="card-body">
+					<h4 class="card-title">Custom Interlocker</h4>
+					<div class="d-flex justify-content-between mb-2">
 						<label id="selectUploadFileResponse" for="selectUploadFile" class="btn btn-outline-primary" style="width: 49%">Select a BahnDSL file (*.bahn)</label>
 						<input id="selectUploadFile" type="file" accept=".bahn" hidden />
 						<button id="uploadInterlockerButton" type="button" class="btn btn-outline-primary" style="width: 49%">Upload</button>
 					</div>
-					<br />
-					<div class="alert alert-info" role="alert">
-						<span id="uploadResponse"></span>
+					<div class="alert alert-info btnPaddingReplicate">
+						<span id="uploadResponse">&nbsp;</span>
 					</div>
-
-					<br />
-
+					<hr class="mx-3 my-3" />
 					<label class="form-label" for="availableInterlockers">Available Interlockers:</label>
-					<div class="input-group">
+					<div class="input-group mb-2">
 						<span id="interlocker-label" class="input-group-text" for="availableInterlockers">Interlocker</span>
 						<select class="form-select" id="availableInterlockers">
 							<option>libinterlocker_default (unremovable)</option>
 							<option>libinterlocker_simple_sectional (unremovable)</option>
 						</select>
 					</div>
-					<br />
-					<label class="form-label" for="interlockerInUse">Interlocker in use:</label>
-					<div class="alert alert-info" role="alert">
-						<span id="interlockerInUse">libinterlocker_default (unremovable)</span>
+					<div class="input-group mb-2">
+						<label class="input-group-text">Interlocker in use:</label>
+						<span id="interlockerInUse" class="input-group-text">libinterlocker_default (unremovable)</span>
 					</div>
-
-					<br />
-
-					<div class="d-flex justify-content-between">
-						<button id="setInterlockerButton" type="button" class="btn btn-outline-primary btn-sm" style="width: 24%">Set</button>
-						<button id="unsetInterlockerButton" type="button" class="btn btn-outline-primary btn-sm" style="width: 24%">Unset</button>
-						<button id="refreshInterlockersButton" type="button" class="btn btn-outline-primary btn-sm" style="width: 24%">Refresh</button>
-						<button id="removeInterlockerButton" type="button" class="btn btn-outline-primary btn-sm" style="width: 24%">Remove</button>
+					<div class="d-flex justify-content-between mb-2">
+						<button id="setInterlockerButton" type="button" class="btn btn-outline-primary" style="width: 24%">Set</button>
+						<button id="unsetInterlockerButton" type="button" class="btn btn-outline-warning" style="width: 24%">Unset</button>
+						<button id="refreshInterlockersButton" type="button" class="btn btn-outline-secondary" style="width: 24%">Refresh</button>
+						<button id="removeInterlockerButton" type="button" class="btn btn-outline-danger" style="width: 24%">Remove</button>
 					</div>
-					<br />
-					<div class="alert alert-info" role="alert">
-						<span id="refreshRemoveInterlockerResponse"></span>
+					<div class="alert alert-info btnPaddingReplicate">
+						<span id="refreshRemoveInterlockerResponse">&nbsp;</span>
 					</div>
 				</div>
 			</div>
 		</div>
 
 		<div class="col">
-			<div class="card">
+			<div class="card stdCardPadMarg">
 				<div class="card-body">
-					<h3 class="card-title">Point Controller</h3>
-
-					<div class="row">
-						<div class="col">
-							<select class="form-select" id=pointId>
-								<option>point1</option>
-								<option>point2</option>
-								<option>point3</option>
-								<option>point4</option>
-								<option>point5</option>
-								<option>point6</option>
-								<option>point7</option>
-								<option>point8</option>
-								<option>point9</option>
-								<option>point10</option>
-								<option>point11</option>
-								<option>point12</option>
-								<option>point13</option>
-								<option>point14</option>
-								<option>point15</option>
-								<option>point16</option>
-								<option>point17</option>
-								<option>point18a</option>
-								<option>point18b</option>
-								<option>point19</option>
-								<option>point20</option>
-								<option>point21</option>
-								<option>point22</option>
-								<option>point23</option>
-								<option>point24</option>
-								<option>point25</option>
-								<option>point26</option>
-								<option>point27</option>
-								<option>point28</option>
-								<option>point29</option>
-							</select>
-						</div>
-					</div>
-
-					</br>
-
-					<div class="d-flex justify-content-between">
-						<button id=setPointButtonNormal type="button" class="pointBtn btn btn-outline-primary" style="width: 49%;">Normal</button>
-						<button id=setPointButtonReverse type="button" class="pointBtn btn btn-outline-primary" style="width: 49%;">Reverse</button>
+					<h4 class="card-title">Point Controller</h4>
+					<div class="input-group mb-2">
+						<label class="input-group-text col-2">Point:</label>
+						<select id="pointId" class="form-select">
+							<option>point1</option>
+							<option>point2</option>
+							<option>point3</option>
+							<option>point4</option>
+							<option>point5</option>
+							<option>point6</option>
+							<option>point7</option>
+							<option>point8</option>
+							<option>point9</option>
+							<option>point10</option>
+							<option>point11</option>
+							<option>point12</option>
+							<option>point13</option>
+							<option>point14</option>
+							<option>point15</option>
+							<option>point16</option>
+							<option>point17</option>
+							<option>point18a</option>
+							<option>point18b</option>
+							<option>point19</option>
+							<option>point20</option>
+							<option>point21</option>
+							<option>point22</option>
+							<option>point23</option>
+							<option>point24</option>
+							<option>point25</option>
+							<option>point26</option>
+							<option>point27</option>
+							<option>point28</option>
+							<option>point29</option>
+						</select>
+						<label class="input-group-text col-2">Position:</label>
+						<select id="pointPosition" class="form-select">
+							<option>normal</option>
+							<option>reverse</option>
+						</select>
+						<button id="setPointButton" class="btn btn-outline-primary">Set</button>
 					</div>
-					</br>
-					<div class="alert alert-info" role="alert">
-						<span id=setPointResponse></span>
+					<div class="alert alert-info btnPaddingReplicate">
+						<span id="setPointResponse" class="alignedSpanForLine">&nbsp;</span>
 					</div>
 
-					</br>
-
-					<h3 class="card-title">Signal Controller</h3>
-
-					<div class="row">
-						<div class="col">
-							<select class="form-select" id="signalId">
-								<option>signal1</option>
-								<option>signal2</option>
-								<option>signal3</option>
-								<option>signal4</option>
-								<option>signal4a</option>
-								<option>signal4b</option>
-								<option>signal5</option>
-								<option>signal6</option>
-								<option>signal7</option>
-								<option>signal7a</option>
-								<option>signal7b</option>
-								<option>signal8</option>
-								<option>signal9</option>
-								<option>signal10</option>
-								<option>signal11</option>
-								<option>signal12</option>
-								<option>signal13</option>
-								<option>signal14</option>
-								<option>signal15</option>
-								<option>signal16</option>
-								<option>signal17</option>
-								<option>signal18</option>
-								<option>signal18a</option>
-								<option>signal18b</option>
-								<option>signal19</option>
-								<option>signal20</option>
-								<option>signal21</option>
-								<option>signal22</option>
-								<option>signal22a</option>
-								<option>signal22b</option>
-								<option>signal23</option>
-								<option>signal24</option>
-								<option>signal25</option>
-								<option>signal26</option>
-								<option>signal27</option>
-								<option>signal28</option>
-								<option>signal29</option>
-								<option>signal30</option>
-								<option>signal31</option>
-								<option>signal32</option>
-								<option>signal33</option>
-								<option>signal34</option>
-								<option>signal35</option>
-								<option>signal35a</option>
-								<option>signal35b</option>
-								<option>signal36</option>
-								<option>signal37</option>
-								<option>signal38</option>
-								<option>signal39</option>
-								<option>signal40</option>
-								<option>signal41</option>
-								<option>signal42</option>
-								<option>signal43</option>
-								<option>signal44</option>
-								<option>signal45</option>
-								<option>signal46</option>
-								<option>signal46a</option>
-								<option>signal46b</option>
-								<option>signal47</option>
-								<option>signal48</option>
-								<option>signal48a</option>
-								<option>signal48b</option>
-								<option>signal49</option>
-								<option>signal50</option>
-								<option>signal50a</option>
-								<option>signal50b</option>
-								<option>signal51</option>
-								<option>signal52</option>
-								<option>signal53</option>
-								<option>signal53a</option>
-								<option>signal53b</option>
-								<option>platformlight1</option>
-								<option>platformlight2</option>
-								<option>platformlight4a</option>
-								<option>platformlight4b</option>
-								<option>platformlights</option>
-							</select>
+					<h4 class="card-title">Signal Controller</h4>
+					<div class="input-group mb-2">
+						<label class="input-group-text col-1">Signal:</label>
+						<select id="signalId" class="form-select">
+							<option>signal1</option>
+							<option>signal2</option>
+							<option>signal3</option>
+							<option>signal4</option>
+							<option>signal4a</option>
+							<option>signal4b</option>
+							<option>signal5</option>
+							<option>signal6</option>
+							<option>signal7</option>
+							<option>signal7a</option>
+							<option>signal7b</option>
+							<option>signal8</option>
+							<option>signal9</option>
+							<option>signal10</option>
+							<option>signal11</option>
+							<option>signal12</option>
+							<option>signal13</option>
+							<option>signal14</option>
+							<option>signal15</option>
+							<option>signal16</option>
+							<option>signal17</option>
+							<option>signal18</option>
+							<option>signal18a</option>
+							<option>signal18b</option>
+							<option>signal19</option>
+							<option>signal20</option>
+							<option>signal21</option>
+							<option>signal22</option>
+							<option>signal22a</option>
+							<option>signal22b</option>
+							<option>signal23</option>
+							<option>signal24</option>
+							<option>signal25</option>
+							<option>signal26</option>
+							<option>signal27</option>
+							<option>signal28</option>
+							<option>signal29</option>
+							<option>signal30</option>
+							<option>signal31</option>
+							<option>signal32</option>
+							<option>signal33</option>
+							<option>signal34</option>
+							<option>signal35</option>
+							<option>signal35a</option>
+							<option>signal35b</option>
+							<option>signal36</option>
+							<option>signal37</option>
+							<option>signal38</option>
+							<option>signal39</option>
+							<option>signal40</option>
+							<option>signal41</option>
+							<option>signal42</option>
+							<option>signal43</option>
+							<option>signal44</option>
+							<option>signal45</option>
+							<option>signal46</option>
+							<option>signal46a</option>
+							<option>signal46b</option>
+							<option>signal47</option>
+							<option>signal48</option>
+							<option>signal48a</option>
+							<option>signal48b</option>
+							<option>signal49</option>
+							<option>signal50</option>
+							<option>signal50a</option>
+							<option>signal50b</option>
+							<option>signal51</option>
+							<option>signal52</option>
+							<option>signal53</option>
+							<option>signal53a</option>
+							<option>signal53b</option>
+							<option>platformlight1</option>
+							<option>platformlight2</option>
+							<option>platformlight4a</option>
+							<option>platformlight4b</option>
+							<option>platformlights</option>
+						</select>
+						<div class="d-flex justify-content-between w-50">
+							<button id=setSignalButtonRed type="button" class="signalBtn btn btn-outline-danger" style="width: 24%;">Stop</button>
+							<button id=setSignalButtonYellow type="button" class="signalBtn btn btn-outline-warning" style="width: 24%;">Caution</button>
+							<button id=setSignalButtonGreen type="button" class="signalBtn btn btn-outline-success" style="width: 24%; ">Go</button>
+							<button id=setSignalButtonWhite type="button" class="signalBtn btn btn-outline-dark" style="width: 24%; ">Shunt</button>
 						</div>
 					</div>
-
-					</br>
-
-					<div class="d-flex justify-content-between">
-						<button id=setSignalButtonRed type="button" class="signalBtn btn btn-outline-danger" style="width: 24%;">Stop</button>
-						<button id=setSignalButtonYellow type="button" class="signalBtn btn btn-outline-warning" style="width: 24%;">Caution</button>
-						<button id=setSignalButtonGreen type="button" class="signalBtn btn btn-outline-success" style="width: 24%; ">Go</button>
-						<button id=setSignalButtonWhite type="button" class="signalBtn btn btn-outline-dark" style="width: 24%; ">Shunt</button>
-					</div>
-					</br>
-					<div class="alert alert-info" role="alert">
-						<span id=setSignalResponse></span>
-					</div>
-
-					</br>
-				
-					<h3 class="card-title">Peripheral Controller</h3>
-
-					<div class="row">
-						<div class="col">
-							<div class="input-group mb-3">
-								<label class="input-group-text col-2">ID</label>
-								<input type="text" class="form-control form-control" id=peripheralId>
-							</div>
-							<div class="input-group">
-								<label class="input-group-text col-2">State</label>
-								<input type="text" class="form-control form-control" id=peripheralState>
-							</div>
-						</div>
+					<div class="alert alert-info btnPaddingReplicate">
+						<span id=setSignalResponse>&nbsp;</span>
 					</div>
 
-					</br>
-
-					<div class="d-flex justify-content-between">
-						<button id=setPeripheralStateButton type="button" class="peripheralBtn btn btn-outline-primary w-100">Set</button>
+					<h4 class="card-title">Peripheral Controller</h4>
+					<div class="input-group mb-2">
+						<label class="input-group-text">Peripheral:</label>
+						<input id="peripheralId" class="form-control">
+						<label class="input-group-text">Aspect:</label>
+						<input id="peripheralState" class="form-control">
+						<button id="setPeripheralStateButton" class="btn btn-outline-primary">Set</button>
 					</div>
-					</br>
-					<div class="alert alert-info" role="alert">
-						<span id=setPeripheralResponse></span>
+					<div class="alert alert-info btnPaddingReplicate">
+						<span id="setPeripheralResponse" class="alignedSpanForLine">&nbsp;</span>
 					</div>
 				</div>
 			</div>
diff --git a/server/src/assets/driver.html b/server/src/assets/driver.html
index 420dae91..cd757e0a 100644
--- a/server/src/assets/driver.html
+++ b/server/src/assets/driver.html
@@ -30,313 +30,304 @@
 
 	<div class="row row-cols-1 row-cols-lg-2 g-4">
 		<div class="col">
-			<div class="card">
+			<div class="card stdCardPadMarg">
 				<div class="card-body">
-					<h3 class="card-title">System</h3>
-
-					<div>
-						<button id="pingButton" type="button" class="btn btn-outline-primary btn-block">Ping SWTbahn Server</button>
-					</div>
-					<br />
-					<div class="alert alert-info" role="alert">
-						<span id="pingResponse"></span>
-					</div>
-
-					<br />
-
+					<h4 class="card-title">System</h4>
 					<div class="d-flex justify-content-between">
-						<button id="startupButton" type="button" class="btn btn-outline-primary" style="width: 49%">Startup</button>
-						<button id="shutdownButton" type="button" class="btn btn-outline-primary" style="width: 49%">Shutdown</button>
+						<button id="pingButton" class="btn btn-outline-primary halfWJustifyHelper">
+							Ping the SWTbahn Server
+						</button>
+						<div class="alert alert-info halfWJustifyHelper btnPaddingReplicate">
+							<span id="pingResponse" class="alignedSpanForLine">&nbsp;</span>
+						</div>
 					</div>
-					<br />
-					<div class="alert alert-info" role="alert">
-						<span id="startupShutdownResponse"></span>
+					<div class="d-flex justify-content-between">
+						<button id="startupButton" class="btn btn-primary thirdWJustifyHelper">Startup</button>
+						<button id="shutdownButton" class="btn btn-danger thirdWJustifyHelper">Shutdown</button>
+						<div class="alert alert-info thirdWJustifyHelper btnPaddingReplicate">
+							<span id="startupShutdownResponse" class="alignedSpanForLine">&nbsp;</span>
+						</div>
 					</div>
-
-					<br />
-
-					<div class="alert alert-dark" role="alert">
-						<span id="sessionGrabId">Session ID: 0, Grab ID: -1</span>
+					<hr class="mx-3 my-3" />
+					<div class="d-flex justify-content-between tooltipLoad">
+						<button id="loadAccessoriesButton" class="btn btn-outline-primary halfWJustifyHelper">
+							Load signals
+						</button>
+						<div class="alert alert-info halfWJustifyHelper btnPaddingReplicate">
+							<span id="loadAccessoriesResponse" class="alignedSpanForLine">&nbsp;</span>
+						</div>
+						<span class="tooltiptext tooltip-top">
+							Replaces the default signals selectable in dropdowns on this page with the ones available on the platform being used.
+							Works only when server is running.
+						</span>
 					</div>
+				</div>
+			</div>
+			<div class="card stdCardPadMarg">
+				<div class="card-body">
+					<h4 class="card-title">Custom Engine</h4>
 
-					<br />
-					<br />
-
-					<h3 class="card-title">Custom Engine</h3>
-
-					<div class="d-flex justify-content-between">
+					<div class="d-flex justify-content-between mb-2">
 						<label id="selectUploadFileResponse" for="selectUploadFile" class="btn btn-outline-primary" style="width: 49%; margin: 0px">Select an SCCharts file (*.sctx)</label>
 						<input id="selectUploadFile" type="file" accept=".sctx" hidden />
 						<button id="uploadEngineButton" type="button" class="btn btn-outline-primary" style="width: 49%">Upload</button>
 					</div>
-					<br />
-					<div class="alert alert-info" role="alert">
-						<pre id="uploadResponse"></pre>
+					<div class="alert alert-info btnPaddingReplicate">
+						<pre id="uploadResponse">&nbsp;</pre>
 						<button id=verificationLogDownloadButton type="button" class="btn btn-outline-secondary">Download Logs</button>
 						<button id=clearVerificationMsgButton type="button" class="btn btn-outline-secondary">Clear Message</button>
 					</div>
-
-					<br />
-
+					<hr class="mx-3 my-3" />
 					<label class="form-label" for="availableEngines">Available Engines:</label>
-					<div class="input-group">
+					<div class="input-group mb-2">
 						<span class="input-group-text" for="availableEngines">Engine</span>
 						<select class="form-select" id="availableEngines">
 							<option>libtrain_engine_default (unremovable)</option>
 							<option>libtrain_engine_linear (unremovable)</option>
 						</select>
 					</div>
-
-					<br />
-
-					<div class="d-flex justify-content-between">
+					<div class="d-flex justify-content-between mb-2">
 						<button id="refreshEnginesButton" type="button" class="btn btn-outline-primary" style="width: 49%">Refresh</button>
-						<button id="removeEngineButton" type="button" class="btn btn-outline-primary" style="width: 49%">Remove</button>
+						<button id="removeEngineButton" type="button" class="btn btn-outline-danger" style="width: 49%">Remove</button>
 					</div>
-					<br />
-					<div class="alert alert-info" role="alert">
-						<span id="refreshRemoveEngineResponse"></span>
+					<div class="alert alert-info btnPaddingReplicate">
+						<span id="refreshRemoveEngineResponse">&nbsp;</span>
 					</div>
 				</div>
 			</div>
 		</div>
 
 		<div class="col">
-			<div class="card">
+			<div class="card stdCardPadMarg">
 				<div class="card-body">
-					<h3 class="card-title">Train Driver</h3>
+					<h4 class="card-title">Train Driver</h4>
 					<p class="card-text">
 						Grab an available train to drive it around the track.
 					</p>
+					<div class="input-group mb-1">
+						<span class="input-group-text col-2" for="grabTrainId">Train</span>
+						<select id="grabTrainId" class="form-select">
+							<option>cargo_db</option>
+							<option>cargo_bayern</option>
+							<option>cargo_green</option>
+							<option>cargo_g1000bb</option>
+							<option>perso_sbb</option>
+							<option>regional_odeg</option>
+							<option>regional_brengdirect</option>
+						</select>
+					</div>
 
-					<div class="form-group">
-						<div class="input-group mb-3">
-							<span class="input-group-text col-2" for="grabTrainId">Train</span>
-							<select class="form-select" id="grabTrainId">
-								<option>cargo_db</option>
-								<option>cargo_bayern</option>
-								<option>cargo_green</option>
-								<option>regional_odeg</option>
-								<option>regional_brengdirect</option>
-							</select>
-						</div>
-
-						<div class="input-group">
-							<span class="input-group-text col-2" for="grabEngine">Engine</span>
-							<select class="form-select" id="grabEngine">
-								<option>libtrain_engine_default (unremovable)</option>
-								<option>libtrain_engine_linear (unremovable)</option>
-							</select>
-						</div>
-
-						<br />
-
-						<div class="d-flex justify-content-between">
-							<button id="grabTrainButton" type="button" class="btn btn-outline-primary" style="width: 49%">Grab</button>
-							<button id="releaseTrainButton" type="button" class="btn btn-outline-primary" style="width: 49%">Release</button>
-						</div>
-						<br />
-						<div class="alert alert-info" role="alert">
-							<span id="grabTrainResponse"></span>
-						</div>
+					<div class="input-group mb-1">
+						<span class="input-group-text col-2" for="grabEngine">Engine</span>
+						<select id="grabEngine" class="form-select">
+							<option>libtrain_engine_default (unremovable)</option>
+							<option>libtrain_engine_linear (unremovable)</option>
+						</select>
 					</div>
 
-					<br />
+					<div class="d-flex justify-content-between mb-2">
+						<button id="grabTrainButton" type="button" class="btn btn-outline-primary w-25">Grab</button>
+						<button id="releaseTrainButton" type="button" class="btn btn-outline-primary w-25">Release Train</button>
+						<span id="sessionGrabId" class="input-group-text">Session ID: 0, Grab ID: -1</span>
+					</div>
+					<div class="alert alert-info btnPaddingReplicate mb-4">
+						<span id="grabTrainResponse" class="alignedSpanForLine">&nbsp;</span>
+					</div>
 
-					<div class="input-group">
+					<div class="input-group mb-2">
 						<span class="input-group-text">DCC Speed</span>
-						<input type="text" class="form-control" id="dccSpeed" readonly value="0" />
+						<input id="dccSpeed" type="number" class="form-control" min="0" max="126" value="0" />
 						<button id="speedPlus" type="button" class="btn btn-outline-primary">+</button>
 						<button id="speedMinus" type="button" class="btn btn-outline-primary">–</button>
 					</div>
-
-					<br />
-
-					<div class="d-flex justify-content-between">
-						<button id="swapDirection" type="button" class="btn btn-outline-primary" style="width: 32%">Swap Direction</button>
-						<button id="driveTrainButton" type="button" class="btn btn-outline-primary" style="width: 32%">Drive</button>
-						<button id="stopTrainButton" type="button" class="btn btn-outline-primary" style="width: 32%">Stop</button>
+					<div class="d-flex justify-content-between mb-2">
+						<button id="driveTrainButton" type="button" class="btn btn-outline-primary w-25" >Drive</button>
+						<button id="stopTrainButton" type="button" class="btn btn-outline-danger w-25" >Stop</button>
+						<button id="swapDirection" type="button" class="btn btn-outline-info w-25" >Swap Direction</button>
 					</div>
-					<br />
-					<div class="alert alert-info" role="alert">
-						<span id="driveTrainResponse"></span>
+					<div class="alert alert-info btnPaddingReplicate mb-4">
+						<span id="driveTrainResponse" class="alignedSpanForLine">&nbsp;</span>
 					</div>
 
-					<div class="input-group mb-2">
-						<span class="input-group-text col-2">From</span>
-						<select class="form-select" id="signalIdFrom">
-							<option>signal1</option>
-							<option>signal2</option>
-							<option>signal3</option>
-							<option>signal4</option>
-							<option>signal4a</option>
-							<option>signal4b</option>
-							<option>signal5</option>
-							<option>signal6</option>
-							<option>signal7</option>
-							<option>signal7a</option>
-							<option>signal7b</option>
-							<option>signal8</option>
-							<option>signal9</option>
-							<option>signal10</option>
-							<option>signal11</option>
-							<option>signal12</option>
-							<option>signal13</option>
-							<option>signal14</option>
-							<option>signal15</option>
-							<option>signal16</option>
-							<option>signal17</option>
-							<option>signal18</option>
-							<option>signal18a</option>
-							<option>signal18b</option>
-							<option>signal19</option>
-							<option>signal20</option>
-							<option>signal21</option>
-							<option>signal22</option>
-							<option>signal22a</option>
-							<option>signal22b</option>
-							<option>signal23</option>
-							<option>signal24</option>
-							<option>signal25</option>
-							<option>signal26</option>
-							<option>signal27</option>
-							<option>signal28</option>
-							<option>signal29</option>
-							<option>signal30</option>
-							<option>signal31</option>
-							<option>signal32</option>
-							<option>signal33</option>
-							<option>signal34</option>
-							<option>signal35</option>
-							<option>signal35a</option>
-							<option>signal35b</option>
-							<option>signal36</option>
-							<option>signal37</option>
-							<option>signal38</option>
-							<option>signal39</option>
-							<option>signal40</option>
-							<option>signal41</option>
-							<option>signal42</option>
-							<option>signal43</option>
-							<option>signal44</option>
-							<option>signal45</option>
-							<option>signal46</option>
-							<option>signal46a</option>
-							<option>signal46b</option>
-							<option>signal47</option>
-							<option>signal48</option>
-							<option>signal48a</option>
-							<option>signal48b</option>
-							<option>signal49</option>
-							<option>signal50</option>
-							<option>signal50a</option>
-							<option>signal50b</option>
-							<option>signal51</option>
-							<option>signal52</option>
-							<option>signal53</option>
-							<option>signal53a</option>
-							<option>signal53b</option>
-						</select>
-					</div>
+					<div class="d-flex justify-content-between mb-2">
+						<div class="input-group">
+							<span class="input-group-text col-4">From</span>
+							<select id="signalIdFrom" class="form-select">
+								<option>signal1</option>
+								<option>signal2</option>
+								<option>signal3</option>
+								<option>signal4</option>
+								<option>signal4a</option>
+								<option>signal4b</option>
+								<option>signal5</option>
+								<option>signal6</option>
+								<option>signal7</option>
+								<option>signal7a</option>
+								<option>signal7b</option>
+								<option>signal8</option>
+								<option>signal9</option>
+								<option>signal10</option>
+								<option>signal11</option>
+								<option>signal12</option>
+								<option>signal13</option>
+								<option>signal14</option>
+								<option>signal15</option>
+								<option>signal16</option>
+								<option>signal17</option>
+								<option>signal18</option>
+								<option>signal18a</option>
+								<option>signal18b</option>
+								<option>signal19</option>
+								<option>signal20</option>
+								<option>signal21</option>
+								<option>signal22</option>
+								<option>signal22a</option>
+								<option>signal22b</option>
+								<option>signal23</option>
+								<option>signal24</option>
+								<option>signal25</option>
+								<option>signal26</option>
+								<option>signal27</option>
+								<option>signal28</option>
+								<option>signal29</option>
+								<option>signal30</option>
+								<option>signal31</option>
+								<option>signal32</option>
+								<option>signal33</option>
+								<option>signal34</option>
+								<option>signal35</option>
+								<option>signal35a</option>
+								<option>signal35b</option>
+								<option>signal36</option>
+								<option>signal37</option>
+								<option>signal38</option>
+								<option>signal39</option>
+								<option>signal40</option>
+								<option>signal41</option>
+								<option>signal42</option>
+								<option>signal43</option>
+								<option>signal44</option>
+								<option>signal45</option>
+								<option>signal46</option>
+								<option>signal46a</option>
+								<option>signal46b</option>
+								<option>signal47</option>
+								<option>signal48</option>
+								<option>signal48a</option>
+								<option>signal48b</option>
+								<option>signal49</option>
+								<option>signal50</option>
+								<option>signal50a</option>
+								<option>signal50b</option>
+								<option>signal51</option>
+								<option>signal52</option>
+								<option>signal53</option>
+								<option>signal53a</option>
+								<option>signal53b</option>
+							</select>
+						</div>
+						<div class="input-group">
+							<span class="input-group-text col-3">To</span>
+							<select id="signalIdTo" class="form-select">
+								<option>signal1</option>
+								<option>signal2</option>
+								<option>signal3</option>
+								<option>signal4</option>
+								<option>signal4a</option>
+								<option>signal4b</option>
+								<option>signal5</option>
+								<option>signal6</option>
+								<option>signal7</option>
+								<option>signal7a</option>
+								<option>signal7b</option>
+								<option>signal8</option>
+								<option>signal9</option>
+								<option>signal10</option>
+								<option>signal11</option>
+								<option>signal12</option>
+								<option>signal13</option>
+								<option>signal14</option>
+								<option>signal15</option>
+								<option>signal16</option>
+								<option>signal17</option>
+								<option>signal18</option>
+								<option>signal18a</option>
+								<option>signal18b</option>
+								<option>signal19</option>
+								<option>signal20</option>
+								<option>signal21</option>
+								<option>signal22</option>
+								<option>signal22a</option>
+								<option>signal22b</option>
+								<option>signal23</option>
+								<option>signal24</option>
+								<option>signal25</option>
+								<option>signal26</option>
+								<option>signal27</option>
+								<option>signal28</option>
+								<option>signal29</option>
+								<option>signal30</option>
+								<option>signal31</option>
+								<option>signal32</option>
+								<option>signal33</option>
+								<option>signal34</option>
+								<option>signal35</option>
+								<option>signal35a</option>
+								<option>signal35b</option>
+								<option>signal36</option>
+								<option>signal37</option>
+								<option>signal38</option>
+								<option>signal39</option>
+								<option>signal40</option>
+								<option>signal41</option>
+								<option>signal42</option>
+								<option>signal43</option>
+								<option>signal44</option>
+								<option>signal45</option>
+								<option>signal46</option>
+								<option>signal46a</option>
+								<option>signal46b</option>
+								<option>signal47</option>
+								<option>signal48</option>
+								<option>signal48a</option>
+								<option>signal48b</option>
+								<option>signal49</option>
+								<option>signal50</option>
+								<option>signal50a</option>
+								<option>signal50b</option>
+								<option>signal51</option>
+								<option>signal52</option>
+								<option>signal53</option>
+								<option>signal53a</option>
+								<option>signal53b</option>
+							</select>
+						</div>
 
-					<div class="input-group mb-2">
-						<span class="input-group-text col-2">To</span>
-						<select class="form-select" id="signalIdTo">
-							<option>signal1</option>
-							<option>signal2</option>
-							<option>signal3</option>
-							<option>signal4</option>
-							<option>signal4a</option>
-							<option>signal4b</option>
-							<option>signal5</option>
-							<option>signal6</option>
-							<option>signal7</option>
-							<option>signal7a</option>
-							<option>signal7b</option>
-							<option>signal8</option>
-							<option>signal9</option>
-							<option>signal10</option>
-							<option>signal11</option>
-							<option>signal12</option>
-							<option>signal13</option>
-							<option>signal14</option>
-							<option>signal15</option>
-							<option>signal16</option>
-							<option>signal17</option>
-							<option>signal18</option>
-							<option>signal18a</option>
-							<option>signal18b</option>
-							<option>signal19</option>
-							<option>signal20</option>
-							<option>signal21</option>
-							<option>signal22</option>
-							<option>signal22a</option>
-							<option>signal22b</option>
-							<option>signal23</option>
-							<option>signal24</option>
-							<option>signal25</option>
-							<option>signal26</option>
-							<option>signal27</option>
-							<option>signal28</option>
-							<option>signal29</option>
-							<option>signal30</option>
-							<option>signal31</option>
-							<option>signal32</option>
-							<option>signal33</option>
-							<option>signal34</option>
-							<option>signal35</option>
-							<option>signal35a</option>
-							<option>signal35b</option>
-							<option>signal36</option>
-							<option>signal37</option>
-							<option>signal38</option>
-							<option>signal39</option>
-							<option>signal40</option>
-							<option>signal41</option>
-							<option>signal42</option>
-							<option>signal43</option>
-							<option>signal44</option>
-							<option>signal45</option>
-							<option>signal46</option>
-							<option>signal46a</option>
-							<option>signal46b</option>
-							<option>signal47</option>
-							<option>signal48</option>
-							<option>signal48a</option>
-							<option>signal48b</option>
-							<option>signal49</option>
-							<option>signal50</option>
-							<option>signal50a</option>
-							<option>signal50b</option>
-							<option>signal51</option>
-							<option>signal52</option>
-							<option>signal53</option>
-							<option>signal53a</option>
-							<option>signal53b</option>
-						</select>
+						<div class="input-group">
+							<span class="input-group-text col-5">Route ID</span>
+							<input id="routeId" type="text" class="form-control" readonly value="None" />
+						</div>
 					</div>
 
-					<div class="input-group mb-3">
-						<span class="input-group-text col-2">Route ID</span>
-						<input type="text" class="form-control" id="routeId" readonly value="None" />
+					<div class="d-flex justify-content-between mb-2">
+						<button id="requestRouteButton" type="button" class="btn btn-outline-primary w-45 m-auto">
+							Request Route
+						</button>
+						<button id="releaseRouteButton" type="button" class="btn btn-outline-danger w-45 m-auto">
+							Release Route
+						</button>
 					</div>
 
 					<div class="d-flex justify-content-between mb-2">
-						<button id="requestRouteButton" type="button" class="btn btn-outline-primary"
-							style="width: 49%">Request</button>
-						<button id="releaseRouteButton" type="button" class="btn btn-outline-primary"
-							style="width: 49%">Release</button>
-					</div>
-				
-					<div class="d-flex justify-content-between">
-						<button id="automaticDriveRouteButton" type="button" class="btn btn-outline-primary"
-							style="width: 49%">Automatic Drive Route</button>
-						<button id="manualDriveRouteButton" type="button" class="btn btn-outline-primary"
-							style="width: 49%">Manual Drive Route</button>
+						<button id="automaticDriveRouteButton" type="button" class="btn btn-outline-primary w-45 m-auto">
+							Automatic Drive Route
+						</button>
+						<button id="manualDriveRouteButton" type="button" class="btn btn-outline-primary w-45 m-auto">
+							Manual Drive Route
+						</button>
 					</div>
-					</br>
-					<div class="alert alert-info" role="alert">
-						<span id="routeResponse"></span>
+					<div class="alert alert-info btnPaddingReplicate">
+						<span id="routeResponse" class="alignedSpanForLine">&nbsp;</span>
 					</div>
 				</div>
 			</div>
diff --git a/server/src/assets/game/README.md b/server/src/assets/game/README.md
index 162bfaaf..1055af2c 100644
--- a/server/src/assets/game/README.md
+++ b/server/src/assets/game/README.md
@@ -67,11 +67,13 @@ The source files of the SWTbahn Game client are organised in a model-view-contro
 manner:
 
 - Model and Controller
-  - `destinations-swtbahn-full.js`
-  - `destinations-swtbahn-standard.js`
-  - `destinations-swtbahn-ultraloop.js`
-  - `flags-swtbahn-full.js`
+  - `destinations-swtbahn-full.json`
+  - `destinations-swtbahn-standard.json`
+  - `flags-swtbahn-full.json`
+  - `flags-swtbahn-standard.json`
   - `script-game.js`
+  - `script-game-mutex.js`
+  - `script-game-timer.js`
 - View
   - `driver-game.html`
   - `style-game.css`
diff --git a/server/src/assets/game/destinations-swtbahn-full.json b/server/src/assets/game/destinations-swtbahn-full.json
index 2c6ba203..fc5d7b81 100644
--- a/server/src/assets/game/destinations-swtbahn-full.json
+++ b/server/src/assets/game/destinations-swtbahn-full.json
@@ -256,12 +256,6 @@ const allPossibleDestinations_swtbahnfull = {
     }
   },
   "block6": {
-    "signal44": {
-      "route-id": 127,
-      "orientation": "anticlockwise",
-      "block": "platform5",
-      "segment": "seg78"
-    },
     "signal22a": {
       "route-id": 126,
       "orientation": "anticlockwise",
diff --git a/server/src/assets/game/driver-game.html b/server/src/assets/game/driver-game.html
index 8d08e190..fc0958ed 100644
--- a/server/src/assets/game/driver-game.html
+++ b/server/src/assets/game/driver-game.html
@@ -26,86 +26,35 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1" />
 </head>
 
-<svg id="svgDef">
-	<style>
-		rect {
-			stroke-width: 18px;
-			stroke: var(--flag-stroke);
-			fill: var(--flag-fill);
-		}
-		
-		circle.topLeft {
-			fill: var(--flag-topLeft-fill);
-		}
-		
-		circle.topRight {
-			fill: var(--flag-topRight-fill);
-		}
-		
-		circle.centre {
-			fill: var(--flag-centre-fill);
-		}
-		
-		circle.bottomLeft {
-			fill: var(--flag-bottomLeft-fill);
-		}
-		
-		circle.bottomRight {
-			fill: var(--flag-bottomRight-fill);
-		}
-	</style>
-	
-	<symbol id="flagDef">
-		<rect width="100" height="100"></rect>
-		<circle class="topLeft" cx="25" cy="25" r="10"></circle>
-		<circle class="topRight" cx="75" cy="25" r="10"></circle>
-		<circle class="centre" cx="50" cy="50" r="10"></circle>
-		<circle class="bottomLeft" cx="25" cy="75" r="10"></circle>
-		<circle class="bottomRight" cx="75" cy="75" r="10"></circle>
-	</symbol>
-</svg>
-
 <body>
-	<div class="row justify-content-between">
-		<div class="col p-2">
-			<img class="img-fluid" src="../swtbahn-logo.png">
+	
+	<!-- Header, visible in both train selection and driving/destination choosing views -->
+	<div class="bahn-header">
+		<img id="bahn-logo" src="../swtbahn-logo.png">
+		<div id="endGame-container" class="bahnHeaderButtonContainer">
+			<button id="endGameButton" type="button" class="btn btn-outline-primary">
+				<span lang="de">Beenden</span>
+				<span lang="en">End Trip</span>
+			</button>
 		</div>
-		<div class="col-auto p-2 align-self-end">
-			<div class="row justify-content-end">
-				<div class="col-auto gx-0">
-					<button id="endGameButton" type="button" class="btn btn-outline-primary">
-						<span lang="de">Beenden</span>
-						<span lang="en">End Trip</span>
-					</button>
-				</div>
-					
-				<div class="col-auto">
-					<div class="btn-group gx-0">
-						<input id="changeTips" type="checkbox" class="btn-check">
-						<label class="btn btn-outline-primary" for="changeTips">
-							<span lang="de">Tipps</span>
-							<span lang="en">Tips</span>
-						</label>
-						
-						<button id="changeLang" class="btn btn-outline-primary">
-							<span lang="de">🇩🇪</span>
-							<span lang="en">🇬🇧</span>
-						</button>
-					</div>
-				</div>
-			</div>
+		<div id="tipsAndLang-container" class="btn-group bahnHeaderButtonContainer">
+			<input id="changeTips" type="checkbox" class="btn-check">
+			<label id="tipsLabel" class="btn btn-outline-primary" for="changeTips">
+				<span lang="de">Tipps</span>
+				<span lang="en">Tips</span>
+			</label>
+			<button id="changeLang" class="btn btn-outline-primary">
+				<span lang="de">🇩🇪</span>
+				<span lang="en">🇬🇧</span>
+			</button>
 		</div>
 	</div>
-	
-	<div class="row">
-		<img id="chosenTrain" class="col pt-2 img-fluid" src=""></img>
-	</div>
-	
 	<hr />
 
-	<div id="trainSelection" class="row g-0">
-		<div class="card mb-3 unavailableTrain">
-			<img src="train-cargo-db.jpg" class="card-img-top" alt="Train Cargo DB">
+	<!-- Train Selection View Elements -->
+	<div id="trainSelection">
+		<div class="card mb-2 mx-2 trainCard unavailableTrain">
+			<img src="img/train-cargo-db.jpg" class="card-img-top" alt="Train Cargo DB">
 			<div class="card-body">
 				<h5 class="card-title">Cargo DB</h5>
 				<p class="card-text">
@@ -113,15 +62,15 @@ <h5 class="card-title">Cargo DB</h5>
 						Gewicht: 81 t <br />
 						Länge: 18.90 m <br />
 						Breite: 2.97 m <br />
-						Höhe: 4.27 m <br />
-						Höchstgeschwindigkeit: 150 km/h
+						<!--Höhe: 4.27 m <br />-->
+						Höchstgeschwindigkeit: 160 km/h
 					</span>
 					<span lang="en">
 						Weight: 81 t<br />
 						Length: 18.90 m<br />
 						Width: 2.97 m<br />
-						Height: 4.27 m<br />
-						Max. Speed: 150 km/h
+						<!--Height: 4.27 m<br />-->
+						Max. Speed: 160 km/h
 					</span>
 				</p>
 				<button class="selectTrainButton btn btn-danger" id="cargo_db">
@@ -131,8 +80,35 @@ <h5 class="card-title">Cargo DB</h5>
 			</div>
 		</div>
 
-		<div class="card mb-3 unavailableTrain">
-			<img src="train-cargo-green.jpg" class="card-img-top" alt="Train Cargo Green">
+		<div class="card mb-2 mx-2 trainCard unavailableTrain">
+			<img src="img/train-cargo-bayern.jpg" class="card-img-top" alt="Train Cargo Bayern">
+			<div class="card-body">
+				<h5 class="card-title">Cargo Bayern</h5>
+				<p class="card-text">
+					<span lang="de">
+						Gewicht: 87 t <br />
+						Länge: 19.58 m <br />
+						Breite: 2.97 m <br />
+						<!--Höhe: 4.27 m <br />-->
+						Höchstgeschwindigkeit: 140 km/h
+					</span>
+					<span lang="en">
+						Weight: 87 t <br />
+						Length: 19.58 m <br />
+						Width: 2.97 m <br />
+						<!--Height: 4.27 m<br />-->
+						Max. Speed: 140 km/h
+					</span>
+				</p>
+				<button class="selectTrainButton btn btn-danger" id="cargo_bayern">
+					<span lang="de">Nicht verfügbar</span>
+					<span lang="en">Unavailable</span>
+				</button>
+			</div>
+		</div>
+
+		<div class="card mb-2 mx-2 trainCard unavailableTrain">
+			<img src="img/train-cargo-green.jpg" class="card-img-top" alt="Train Cargo Green">
 			<div class="card-body">
 				<h5 class="card-title">Cargo Green</h5>
 				<p class="card-text">
@@ -140,14 +116,14 @@ <h5 class="card-title">Cargo Green</h5>
 						Gewicht: 85 t <br />
 						Länge: 18.9 m <br />
 						Breite: 2.97 m <br />
-						Höhe: 4.27 m <br />
+						<!--Höhe: 4.27 m <br />-->
 						Höchstgeschwindigkeit: 140 km/h
 					</span>
 					<span lang="en">
-						Weight: 85 t<br />
-						Length: 18.9 m<br />
-						Width: 2.97 m<br />
-						Height: 4.27 m<br />
+						Weight: 85 t <br />
+						Length: 18.9 m <br />
+						Width: 2.97 m <br />
+						<!--Height: 4.27 m<br />-->
 						Max. Speed: 140 km/h
 					</span>
 				</p>
@@ -156,10 +132,60 @@ <h5 class="card-title">Cargo Green</h5>
 					<span lang="en">Unavailable</span>
 				</button>
 			</div>
-		 </div>
+		</div>
 
-		<div class="card mb-3 unavailableTrain">
-			<img src="train-regional-odeg.jpg" class="card-img-top" alt="Train Regional ODEG">
+		<div class="card mb-2 mx-2 trainCard unavailableTrain">
+			<img src="img/train-cargo-g1000bb.jpg" class="card-img-top" alt="Train G1000BB">
+			<div class="card-body">
+				<h5 class="card-title">Cargo G1000BB</h5>
+				<p class="card-text">
+					<span lang="de">
+						Gewicht: 72 t <br />
+						Länge: 14.10 m <br />
+						Breite: 3.08 m <br />
+						Höchstgeschwindigkeit: 100 km/h
+					</span>
+					<span lang="en">
+						Weight: 72 t <br />
+						Length: 14.10 m <br />
+						Width: 3.08 m <br />
+						Max. Speed: 100 km/h
+					</span>
+				</p>
+				<button class="selectTrainButton btn btn-danger" id="cargo_g1000bb">
+					<span lang="de">Nicht verfügbar</span>
+					<span lang="en">Unavailable</span>
+				</button>
+			</div>
+		</div>
+
+		<div class="card mb-2 mx-2 trainCard unavailableTrain">
+			<img src="img/train-perso-sbb.jpg" class="card-img-top" alt="Train Perso SBB">
+			<div class="card-body">
+				<h5 class="card-title">Perso SBB</h5>
+				<p class="card-text">
+					<span lang="de">
+						Gewicht: 84 t <br />
+						Länge: 18.50 m <br />
+						Breite: 3.00 m <br />
+						Höchstgeschwindigkeit: 200 km/h
+					</span>
+					<span lang="en">
+						Weight: 84 t <br />
+						Length: 18.50 m <br />
+						Width: 3.00 m <br />
+						Max. Speed: 200 km/h
+					</span>
+				</p>
+				<button class="selectTrainButton btn btn-danger" id="perso_sbb">
+					<span lang="de">Nicht verfügbar</span>
+					<span lang="en">Unavailable</span>
+				</button>
+			</div>
+		</div>
+
+		<div class="card mb-2 mx-2 trainCard unavailableTrain">
+			<img src="img/train-regional-odeg.jpg" class="card-img-top" alt="Train Regional ODEG">
 			<div class="card-body">
 				<h5 class="card-title">Regional ODEG</h5>
 				<p class="card-text">
@@ -167,14 +193,14 @@ <h5 class="card-title">Regional ODEG</h5>
 						Gewicht: 70 t <br />
 						Länge: 40.89 m <br />
 						Breite: 3.00 m <br />
-						Höhe: 4.04 m <br />
+						<!--Höhe: 4.04 m <br />-->
 						Höchstgeschwindigkeit: 140 km/h
 					</span>
 					<span lang="en">
-						Weight: 70 t<br />
-						Length: 40.89 m<br />
-						Width: 3.00 m<br />
-						Height: 4.04 m<br />
+						Weight: 70 t <br />
+						Length: 40.89 m <br />
+						Width: 3.00 m <br />
+						<!--Height: 4.04 m<br />-->
 						Max. Speed: 140 km/h
 					</span>
 				</p>
@@ -184,8 +210,9 @@ <h5 class="card-title">Regional ODEG</h5>
 				</button>
 			</div>
 		</div>
-		<div class="card mb-3 unavailableTrain">
-			<img src="train-regional-brengdirect.jpg" class="card-img-top" alt="Train Regional BrengDirect">
+
+		<div class="card mb-2 mx-2 trainCard unavailableTrain">
+			<img src="img/train-regional-brengdirect.jpg" class="card-img-top" alt="Train Regional BrengDirect">
 			<div class="card-body">
 				<h5 class="card-title">Regional Brengdirect</h5>
 				<p class="card-text">
@@ -193,13 +220,13 @@ <h5 class="card-title">Regional Brengdirect</h5>
 						Gewicht: 78.5 t <br />
 						Länge: 53.43 m <br />
 						Breite: 2.65 m <br />
-						Höchstgeschwindigkeit: 115 km/h
+						Höchstgeschwindigkeit: 140 km/h
 					</span>
 					<span lang="en">
-						Weight: 78.5 t<br />
-						Length: 53.43 m<br />
-						Width: 2.65 m<br />
-						Max. Speed: 115 km/h
+						Weight: 78.5 t <br />
+						Length: 53.43 m <br />
+						Width: 2.65 m <br />
+						Max. Speed: 140 km/h
 					</span>
 				</p>
 				<button class="selectTrainButton btn btn-danger" id="regional_brengdirect">
@@ -210,16 +237,135 @@ <h5 class="card-title">Regional Brengdirect</h5>
 		</div>
 	</div>
 
+	<!-- Train Driving & Destination Choosing View Elements -->	
+	<div id="trainGrabbedComponentsContainer">
+		<div id="chosenTrainImgContainer">
+			<img id="chosenTrain" class="img-fluid" src=""></img>
+		</div>
 
+		<!-- Destination Choosing -->
+		<div class="controlContainer" id="destinationsFormContainer">
+			<form id="destinationsForm">
+				<label class="col-form-label-lg me-md-5"><b>
+					<span lang="de">
+						<span class='easy'>Klicke auf das Symbol, zu dem du fahren möchtest:</span>
+						<span class='normal'>Mögliche Ziele:</span>
+					</span>
+					<span lang="en">
+						<span class='easy'>Click the symbol you wish to drive to:</span>
+						<span class='normal'>Possible destinations:</span>
+					</span>
+				</b></label>
+				<div class="input-group row">
+					<div id="possibleDestinations" class="col">
+						<svg class="flag" viewBox="0 0 100 100">
+							<use id="destination0" href="#flagDef" class="flagThemeBlank" value=""></use>
+						</svg>
+						<svg class="flag" viewBox="0 0 100 100">
+							<use id="destination1" href="#flagDef" class="flagThemeBlank" value=""></use>
+						</svg>
+						<svg class="flag" viewBox="0 0 100 100">
+							<use id="destination2" href="#flagDef" class="flagThemeBlank" value=""></use>
+						</svg>
+						<svg class="flag" viewBox="0 0 100 100">
+							<use id="destination3" href="#flagDef" class="flagThemeBlank" value=""></use>
+						</svg>
+						<svg class="flag" viewBox="0 0 100 100">
+							<use id="destination4" href="#flagDef" class="flagThemeBlank" value=""></use>
+						</svg>
+						<svg class="flag" viewBox="0 0 100 100">
+							<use id="destination5" href="#flagDef" class="flagThemeBlank" value=""></use>
+						</svg>
+						<svg class="flag" viewBox="0 0 100 100">
+							<use id="destination6" href="#flagDef" class="flagThemeBlank" value=""></use>
+						</svg>
+						<svg class="flag" viewBox="0 0 100 100">
+							<use id="destination7" href="#flagDef" class="flagThemeBlank" value=""></use>
+						</svg>
+						<svg class="flag" viewBox="0 0 100 100">
+							<use id="destination8" href="#flagDef" class="flagThemeBlank" value=""></use>
+						</svg>
+						<svg class="flag" viewBox="0 0 100 100">
+							<use id="destination9" href="#flagDef" class="flagThemeBlank" value=""></use>
+						</svg>
+						<svg class="flag" viewBox="0 0 100 100">
+							<use id="destination10" href="#flagDef" class="flagThemeBlank" value=""></use>
+						</svg>
+						<svg class="flag" viewBox="0 0 100 100">
+							<use id="destination11" href="#flagDef" class="flagThemeBlank" value=""></use>
+						</svg>
+					</div>
+				</div>
+			</form>
+		</div>
 
-	<div class="m-4"></div>
+		<!-- Train Driving -->
+		<div class="controlContainer">
+			<form id="drivingForm">
+				<div class="row">
+					<label class="col-auto col-form-label-lg"><b>
+						<span lang="de">Fahrzeit:</span>
+						<span lang="en">Driving Time:</span>
+					</b></label>
+					<label class="col-auto col-form-label-lg">
+						<span id="timerMinute">00</span>:<span id="timerSecond">00</span>
+					</label>
+				</div>
+				<div id="chosenDestination" class="row">
+					<label class="col-auto col-form-label-lg"><b>
+						<span lang="de">Ziel:</span>
+						<span lang="en">Destination:</span>
+					</b></label>
+					<svg class="flag currentDestination" viewBox="0 0 100 100">
+						<use id="destination" href="#flagDef" class="flagThemeBlank"></use>
+					</svg>
+				</div>
+				<label class="col-form-label-lg">
+					<span lang="de">
+						<span class="easy">Bitte fahren Sie Ihren Zug zum Ziel und halten Sie kurz vor dem Ziel an</span>
+					</span>
+					<span lang="en">
+						<span class="easy">Please drive your train to the destination and then stop</span>
+					</span>
+				</label>
+				<label class="col-auto col-form-label-lg"><b>
+					<span lang="de">Geschwindigkeitssteuerung:</span>
+					<span lang="en">Speed control:</span>
+				</b></label>
+				<div class="input-group row">
+					<div class="col">
+						<div id="speedButtonContainer" class="btn-group" role="group">
+							<button id="stop" type="button" class="btn btn-danger speedButton" value="0">
+								<span lang="de">Stop</span>
+								<span lang="en">Stop</span>
+							</button>
+							<button id="slow" type="button" class="btn btn-warning speedButton" value="30">
+								<span lang="de">Langsam</span>
+								<span lang="en">Slow</span>
+							</button>
+							<button id="normal" type="button" class="btn btn-secondary speedButton" value="40">
+								<span lang="de">Normal</span>
+								<span lang="en">Normal</span>
+							</button>
+							<button id="fast" type="button" class="btn btn-success speedButton" value="55">
+								<span lang="de">Schnell</span>
+								<span lang="en">Fast</span>
+							</button>
+						</div>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
+
+	<!-- Server Alert Stuff, relevant both for driving/destination and train selection view -->
 
 	<div id="serverAlertBox">
 		<div id="serverAlert" class="alert" role="alert">
 			<span id="serverResponse"></span>
 		</div>
 	</div>
-	
+
 	<div id="serverModal" class="modal fade" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1">
 		<div class="modal-dialog modal-dialog-centered">
 			<div class="modal-content">
@@ -233,124 +379,45 @@ <h5 id="serverModalTitle" class="modal-title"></h5>
 			</div>
 		</div>
 	</div>
+	
+	<!-- Sort of a pre-definition of the possible SVGs for signal flags; this is hidden via CSS. -->
+	<svg id="svgDef">
+		<style>
+			rect {
+				stroke-width: 18px;
+				stroke: var(--flag-stroke);
+				fill: var(--flag-fill);
+			}
 
-	<form id="destinationsForm">
-		<label class="col-form-label-lg me-md-5">
-			<b>
-				<span lang="de">
-					<span class='easy'>Klicke auf das Symbol, zu dem du fahren möchtest:</span>
-					<span class='normal'>Mögliche Ziele:</span>
-				</span>
-				<span lang="en">
-					<span class='easy'>Click the symbol you wish to drive to:</span>
-					<span class='normal'>Possible destinations:</span>
-				</span>
-			</b>
-		</label>
-		<div class="input-group row">
-			<div id="possibleDestinations" class="col">
-				<svg class="flag" viewBox="0 0 100 100">
-					<use id="destination0" href="#flagDef" class="flagThemeBlank" value=""></use>
-				</svg>
-				<svg class="flag" viewBox="0 0 100 100">
-					<use id="destination1" href="#flagDef" class="flagThemeBlank" value=""></use>
-				</svg>
-				<svg class="flag" viewBox="0 0 100 100">
-					<use id="destination2" href="#flagDef" class="flagThemeBlank" value=""></use>
-				</svg>
-				<svg class="flag" viewBox="0 0 100 100">
-					<use id="destination3" href="#flagDef" class="flagThemeBlank" value=""></use>
-				</svg>
-								
-				<div class="m-4"></div>
+			circle.topLeft {
+				fill: var(--flag-topLeft-fill);
+			}
 
-				<svg class="flag" viewBox="0 0 100 100">
-					<use id="destination4" href="#flagDef" class="flagThemeBlank" value=""></use>
-				</svg>
-				<svg class="flag" viewBox="0 0 100 100">
-					<use id="destination5" href="#flagDef" class="flagThemeBlank" value=""></use>
-				</svg>
-				<svg class="flag" viewBox="0 0 100 100">
-					<use id="destination6" href="#flagDef" class="flagThemeBlank" value=""></use>
-				</svg>
-				<svg class="flag" viewBox="0 0 100 100">
-					<use id="destination7" href="#flagDef" class="flagThemeBlank" value=""></use>
-				</svg>
-				<div class="m-4"></div>
+			circle.topRight {
+				fill: var(--flag-topRight-fill);
+			}
 
-				<svg class="flag" viewBox="0 0 100 100">
-					<use id="destination8" href="#flagDef" class="flagThemeBlank" value=""></use>
-				</svg>
-				<svg class="flag" viewBox="0 0 100 100">
-					<use id="destination9" href="#flagDef" class="flagThemeBlank" value=""></use>
-				</svg>
-				<svg class="flag" viewBox="0 0 100 100">
-					<use id="destination10" href="#flagDef" class="flagThemeBlank" value=""></use>
-				</svg>
-				<svg class="flag" viewBox="0 0 100 100">
-					<use id="destination11" href="#flagDef" class="flagThemeBlank" value=""></use>
-				</svg>
-			</div>
-		</div>
-	</form>
+			circle.centre {
+				fill: var(--flag-centre-fill);
+			}
 
-	<form id="drivingForm">
-		<div class="row">
-			<label class="col-auto col-form-label-lg"><b>
-				<span lang="de">Fahrzeit:</span>
-				<span lang="en">Driving Time:</span>
-			</b></label>	
-			<label class="col-auto col-form-label-lg">
-			<span id="timerMinute">00</span>:<span id="timerSecond">00</span>
-			</label>
-		</div>
+			circle.bottomLeft {
+				fill: var(--flag-bottomLeft-fill);
+			}
 
-		<div class="m-3"></div>
-
-		<div id="chosenDestination" class="row">
-			<label class="col-auto col-form-label-lg"><b>
-				<span lang="de">Ziel:</span>
-				<span lang="en">Destination:</span>
-			</b></label>
-			<svg class="flag" viewBox="0 0 100 100">
-				<use id="destination" href="#flagDef" class="flagThemeBlank"></use>
-			</svg>
-			<label class="col-form-label-lg">
-				<span lang="en"><span class="easy">Please drive your train to the destination and then stop</span></span>
-				<span lang="de"><span class="easy">Bitte fahren Sie Ihren Zug zum Ziel und halten Sie kurz vor dem Ziel an</span></span>
-			</span>
-		</div>
-		
-		<div class="m-3"></div>
-		
-		<label class="col-auto col-form-label-lg"><b>
-			<span lang="de">Geschwindigkeitssteuerung:</span>
-			<span lang="en">Speed control:</span>
-		</b></label>
-		<div class="input-group row">
-			<div class="col">
-				<div class="btn-group" role="group">
-					<button id="stop" type="button" class="btn btn-danger btn-lg" value="0">
-						<span lang="de">Stop</span>
-						<span lang="en">Stop</span>
-					</button>
-					<button id="slow" type="button" class="btn btn-warning btn-lg" value="20">
-						<span lang="de">Langsam</span>
-						<span lang="en">Slow</span>
-					</button>
-					<button id="normal" type="button" class="btn btn-secondary btn-lg" value="40">
-						<span lang="de">Normal</span>
-						<span lang="en">Normal</span>
-					</button>
-					<button id="fast" type="button" class="btn btn-success btn-lg" value="60">
-						<span lang="de">Schnell</span>
-						<span lang="en">Fast</span>
-					</button>
-				</div>
-			</div>
-		</div>
-	</form>
+			circle.bottomRight {
+				fill: var(--flag-bottomRight-fill);
+			}
+		</style>
 
+		<symbol id="flagDef">
+			<rect width="100" height="100"></rect>
+			<circle class="topLeft" cx="25" cy="25" r="10"></circle>
+			<circle class="topRight" cx="75" cy="25" r="10"></circle>
+			<circle class="centre" cx="50" cy="50" r="10"></circle>
+			<circle class="bottomLeft" cx="25" cy="75" r="10"></circle>
+			<circle class="bottomRight" cx="75" cy="75" r="10"></circle>
+		</symbol>
+	</svg>
 </body>
-
-</html>
+</html>
\ No newline at end of file
diff --git a/server/src/assets/game/flags-swtbahn-full.json b/server/src/assets/game/flags-swtbahn-full.json
index 46641512..19386463 100644
--- a/server/src/assets/game/flags-swtbahn-full.json
+++ b/server/src/assets/game/flags-swtbahn-full.json
@@ -12,7 +12,6 @@ const signalFlagMap_swtbahnfull = {
   "signal43": "flagThemeBlack flagFilled flagFive",
   "signal50": "flagThemeBlue flagFilled flagOne",
   "signal48": "flagThemeBlue flagFilled flagTwo",
-  "signal44": "flagThemeBlue flagFilled flagThree",
   "signal46": "flagThemeBlue flagFilled flagFour",
   "signal22": "flagThemeBlue flagFilled flagFive",
   "signal8": "flagThemeBlue flagOutline flagZero",
diff --git a/server/src/assets/game/img/train-cargo-bayern.jpg b/server/src/assets/game/img/train-cargo-bayern.jpg
new file mode 100644
index 00000000..12407f6f
Binary files /dev/null and b/server/src/assets/game/img/train-cargo-bayern.jpg differ
diff --git a/server/src/assets/game/img/train-cargo-db.jpg b/server/src/assets/game/img/train-cargo-db.jpg
new file mode 100644
index 00000000..7b87f584
Binary files /dev/null and b/server/src/assets/game/img/train-cargo-db.jpg differ
diff --git a/server/src/assets/game/img/train-cargo-g1000bb.jpg b/server/src/assets/game/img/train-cargo-g1000bb.jpg
new file mode 100644
index 00000000..0d8a3b49
Binary files /dev/null and b/server/src/assets/game/img/train-cargo-g1000bb.jpg differ
diff --git a/server/src/assets/game/img/train-cargo-green.jpg b/server/src/assets/game/img/train-cargo-green.jpg
new file mode 100644
index 00000000..02606d57
Binary files /dev/null and b/server/src/assets/game/img/train-cargo-green.jpg differ
diff --git a/server/src/assets/game/img/train-perso-sbb.jpg b/server/src/assets/game/img/train-perso-sbb.jpg
new file mode 100644
index 00000000..2d30e6c3
Binary files /dev/null and b/server/src/assets/game/img/train-perso-sbb.jpg differ
diff --git a/server/src/assets/game/img/train-regional-brengdirect.jpg b/server/src/assets/game/img/train-regional-brengdirect.jpg
new file mode 100644
index 00000000..e6a11a62
Binary files /dev/null and b/server/src/assets/game/img/train-regional-brengdirect.jpg differ
diff --git a/server/src/assets/game/img/train-regional-odeg.jpg b/server/src/assets/game/img/train-regional-odeg.jpg
new file mode 100644
index 00000000..28cdbf50
Binary files /dev/null and b/server/src/assets/game/img/train-regional-odeg.jpg differ
diff --git a/server/src/assets/game/script-game.js b/server/src/assets/game/script-game.js
index 38c47124..12348755 100644
--- a/server/src/assets/game/script-game.js
+++ b/server/src/assets/game/script-game.js
@@ -4,8 +4,10 @@ var serverAddress = "";      // The base address of the server.
 var language = "";           // User interface language.
 var isEasyMode = false;      // User interface verbosity.
 
+
+
 /**************************************************
- * Destination related information and UI elements
+ * Destination related information/functionality
  */
 
 const numberOfDestinationsMax = 12;           // Maximum destinations to display
@@ -51,7 +53,6 @@ function getDestinations(blockId) {
 	return allPossibleDestinations[blockId];
 }
 
-
 function disableAllDestinationButtons() {
 	driver.clearUpdatePossibleDestinationsInterval();
 
@@ -61,7 +62,6 @@ function disableAllDestinationButtons() {
 	}
 }
 
-
 function setDestinationButton(routeIndex, route, destinationSignal) {
 	// "Clean" the "a" or "b" suffix of composite signal if present
 	const destinationSigCleaned = destinationSignal.replace(/(a|b)$/, '');
@@ -85,7 +85,7 @@ function setDestinationButtonUnavailable(routeIndex, route, destinationSignal) {
 // e.g., when disabling the destination buttons or ending the game.
 function updatePossibleDestinations(blockId) {
 	// Show the form that contains all the destination buttons
-	$('#destinationsForm').show();
+	$('#destinationsFormContainer').show();
 	disableAllDestinationButtons();
 
 	// Set up a timer interval to periodically update the availability
@@ -104,7 +104,6 @@ function updatePossibleDestinations(blockId) {
 			let route = {};
 			route[destinationSignal] = routesFromCurrentBlock[destinationSignal];
 			route['destSignalID'] = destinationSignal;
-			///TODO: check if this works (changed/simplified)
 			const routeId = route[destinationSignal]["route-id"];
 			updateDestinationAvailabilityPromise(
 				routeId,
@@ -157,13 +156,22 @@ function updateDestinationAvailabilityPromise(routeId, available, unavailable) {
 	});
 }
 
+function clearChosenDestination() {
+	$('#destination').attr("class", "flagThemeBlank");
+}
+
+function setChosenDestination(destination) {
+	destination = destination.replace(/(a|b)$/, '');
+	$('#destination').attr("class", signalFlagMap[destination]);
+}
+
 function setChosenTrain(trainId) {
-	const imageName = `train-${trainId.replace("_", "-")}.jpg`
+	const imageName = `img/train-${trainId.replace("_", "-")}.jpg`
 	$("#chosenTrain").attr("src", imageName);
 }
 
 /**************************************************
- * Train speed UI elements
+ * Train speed UI elements/functionality
  */
 
 const speedButtons = [
@@ -173,6 +181,22 @@ const speedButtons = [
 	"fast"
 ];
 
+/* Per-train speed factors -> necessary as a dcc speed setting means different
+   real-world speeds for different trains. "Slow" being dcc speed 20 causes the slower
+   trains to get stuck as they are not fast enough to get through double-slip switches.
+   Ideally the server would have this in the config, but that'd be a lot of work to 
+   implement/add, so for this client it's just defined here.
+*/ 
+const trainSpeedFactors = new Map([
+	["cargo_db", 1.0],
+	["cargo_bayern", 1.2],
+	["cargo_green", 1.1],
+	["cargo_g1000bb", 2.0],
+	["perso_sbb", 0.85],
+	["regional_odeg", 2.0],
+	["regional_brengdirect", 2.0],
+])
+
 function disableSpeedButtons() {
 	$('#drivingForm').hide();
 	speedButtons.forEach(speed => {
@@ -189,14 +213,6 @@ function enableSpeedButtons(destination) {
 	drivingTimer.start();
 }
 
-function clearChosenDestination() {
-	$('#destination').attr("class", "flagThemeBlank");
-}
-
-function setChosenDestination(destination) {
-	destination = destination.replace(/(a|b)$/, '');
-	$('#destination').attr("class", signalFlagMap[destination]);
-}
 
 
 /**************************************************
@@ -223,10 +239,9 @@ function speak(text) {
 		// Don't speak if text is not truthy, i.e., undefined, null, or empty.
 		return;
 	}
-	///TODO: Check if this works, it was `var msg` before.
 	let speakMsg = new SpeechSynthesisUtterance(text);
-	//speakMsg.lang = (language == 'en') ? "en-US" : "de-DE";
 	///NOTE: At the moment, all voice messages are in german or "german-ish" (like "Sorry")
+	//speakMsg.lang = (language == 'en') ? "en-US" : "de-DE";
 	speakMsg.lang = "de-DE";
 	for (const voice of window.speechSynthesis.getVoices()) {
 		if (voice.lang == "de-DE") {
@@ -860,7 +875,7 @@ class Driver {
 		// Note: this.routeDetails is set to pRouteDetails in this.requestRouteIdPromise success handler!
 		this.requestRouteIdPromise(pRouteDetails)                      // 1. Ensure that the chosen destination is still available
 			.then(() => this.updateDrivingDirectionPromise())          // 2. Obtain the physical driving direction
-			.then(() => $('#destinationsForm').hide())                 // 3. Prevent the driver from choosing another destination
+			.then(() => $('#destinationsFormContainer').hide())        // 3. Prevent the driver from choosing another destination
 			.then(() => disableAllDestinationButtons())
 			.then(() => Mutex.unlock(lock))
 			.then(() => this.setTrainSpeedPromise(1))                  // 4. Update the train lights to indicate the physical driving direction
@@ -923,7 +938,7 @@ function startGameLogic() {
 // Update the user interface for driving when the user decides to release their train
 function endGameLogic() {
 	$('#endGameButton').hide();
-	$('#destinationsForm').hide();
+	$('#destinationsFormContainer').hide();
 	driver.clearUpdatePossibleDestinationsInterval();
 	driver.clearDestinationReachedInterval();
 	driver.resetTrainSession();
@@ -994,7 +1009,7 @@ function initialise() {
 
 	// Hide the train driving buttons (destination selections).
 	$('#endGameButton').hide();
-	$('#destinationsForm').hide();
+	$('#destinationsFormContainer').hide();
 	clearChosenDestination();
 	driver.disableDestinationReached();
 
@@ -1037,7 +1052,9 @@ function initialise() {
 	speedButtons.forEach(speed => {
 		const speedButton = $(`#${speed}`);
 		speedButton.click(function () {
-			driver.setTrainSpeedPromise(speedButton.val());
+			let speedButtonVal = speedButton.val();
+			let speedAdjusted = Math.round(speedButtonVal * trainSpeedFactors.get(driver.trainId));
+			driver.setTrainSpeedPromise(speedAdjusted);
 			if (!driver.isDestinationReached) {
 				$('#endGameButton').hide();
 
diff --git a/server/src/assets/game/style-game.css b/server/src/assets/game/style-game.css
index 587c2822..922544af 100644
--- a/server/src/assets/game/style-game.css
+++ b/server/src/assets/game/style-game.css
@@ -1,14 +1,70 @@
 body {
   font-family: UB Scala Sans, sans-serif;
   margin: 0 20px;
+  line-height: 1.4;
 }
 
+/* ==================== Page Header Element Styling ==================== */
+#bahn-logo {
+  max-width: 35%;
+  width: auto;
+  max-height: inherit;
+  margin-right: 0.5rem;
+}
+
+.bahnHeaderButtonContainer {
+  padding-top: 0.25rem;
+}
+
+#endGame-container {
+  margin-right: 2vw;
+  margin-left: auto;
+  /*to behave the same as the tips and language div*/
+	display: inline-flex; 
+}
+
+.bahn-header {
+  margin-left: 10%;
+  margin-right: 10%;
+  margin-top: 0.75rem;
+  width: auto;
+  display: flex;
+  align-items:center;
+  justify-content: space-between;
+  max-height: 10vh;
+}
+
+@media (orientation: landscape) {
+  /*
+  Limit the height of the header for screens 
+  that are not too narrow in aspect ratio, e.g., iPads. 
+  Modern Smartphones have a slender aspect ratio
+  that causes 8vh to be quite small, too small for normal text.
+  */
+  @media (max-aspect-ratio: 1.8) {
+    .bahn-header {
+      max-height: 8vh !important;
+    }
+    
+    .bahnHeaderButtonContainer {
+      max-height: 8vh !important;
+    }
+  }
+}
+
+
+
+/* ==================== Train Selection page styling ==================== */
+
 #trainSelection {
   display: flex;
-  flex-direction: row;
   justify-content: center;
   align-items: center;
   height: 100%;
+  /* flex direction is part of the screen orientation sensitive media queries */
+  
+  margin-left: auto;
+  margin-right: auto;
 }
 
 .unavailableTrain {
@@ -16,8 +72,152 @@ body {
   background-color: MistyRose;
 }
 
+@media (orientation: landscape) {
+  #trainSelection {
+    flex-direction: row;
+    flex-wrap: wrap;
+    width: 100%;
+  }
+  
+  .trainCard {
+    /* Optimized for iPad in landscape mode to fit all cards/trains */
+    max-width: 22%;
+    min-width: 15%;
+  }
+  
+  .trainCard .card-body {
+    /* Adjust bootstrap padding of card-body here, to fit more trains onto screen.
+       Default padding is 1rem, this is a bit too much for an iPad to fit all trains 
+       without scrolling.
+    */
+    padding: 0.5rem 0.5rem;
+  }
+  
+  @media (max-aspect-ratio: 1.8) {
+    /* For non-slender screens (i.e., iPads, but not modern smartphones),
+       limit the size of the train image, in order to fit all trains on the
+       screen.
+    */
+    .card-img-top {
+      object-fit: cover;
+      height: 11vh;
+    }
+  }
+}
+
+@media (orientation: portrait) {
+  #trainSelection {
+    flex-direction: column;
+    width: 80%;
+  }
+}
+
+
+
+/* ==================== Driving/Destination Elements Styling ==================== */
+
+#trainGrabbedComponentsContainer {
+  display: flex;
+  align-items: flex-start;
+}
+
+/* Hide the SVG template for the destination flags */
+#svgDef {
+  height: 0px;
+  width: 0px;
+}
+
+#possibleDestinations svg.flag {
+  cursor: pointer;
+}
+
+@media (orientation: landscape) {
+  #trainGrabbedComponentsContainer {
+    flex-direction: row;
+    flex-wrap: wrap;
+  }
+  
+  #chosenTrainImgContainer {
+    /* The rules below are required to make the img cropping work */
+    width: 48%;
+    margin-right: -3%;
+    vertical-align: middle;
+    margin-top: auto;
+    margin-bottom: auto;
+    overflow:hidden;
+  }
+  
+  #chosenTrain {
+    /*Crop the image on its left hand side to allow a taller right flexbox for controls*/
+    position: relative;
+    margin-left: -15%;
+  }
+  
+  .controlContainer {
+    /* Allows a control container to appear on the right hand side, 
+       i.e., fit next to the image of the train. */
+    width: 55%;
+  }
+  
+  .currentDestination {
+    /* SVG with flag of current destination needs to appear somewhat differently 
+       in landscape view to appear appropriately sized. */
+    max-width: 18% !important;
+    margin-bottom: 0% !important;
+  }
+  
+  .possibleDestinations {
+    flex-direction: row;
+    flex-wrap: wrap;
+  }
+  
+  svg.flag {
+    max-width: 13%;
+    min-width: 10%;
+    height: auto;
+    margin-right: 3%;
+    margin-bottom: 3%;
+  }
+}
+
+@media (orientation: portrait) {
+  #trainGrabbedComponentsContainer {
+    flex-direction: column;
+    flex-wrap: wrap;
+  }
+  
+  #chosenTrainImgContainer {
+    width: 100%;
+  }
+  
+  svg.flag {
+    width: 20%;
+    height: auto;
+    margin-right: 4%;
+    margin-bottom: 4%;
+  }
+  
+  .controlContainer {
+    width: 100%;
+  }
+  
+  #speedButtonContainer {
+    flex-wrap: wrap;
+    width: 100%;
+  }
+  
+  .speedButton {
+    max-width: 25%;
+  }
+}
+
+
+
+/* ==================== Other/General Styling ==================== */
+
 #serverAlertBox {
-  height: 70px;
+  min-height: 100px;
+  margin-top: 1.25em;
 }
 
 #serverAlert {
@@ -58,22 +258,6 @@ body {
   border-top: none;
 }
 
-/* Hide the SVG template for the destination flags */
-#svgDef {
-  height: 0px;
-  width: 0px;
-}
-
-svg.flag {
-  width: 20%;
-  height: auto;
-  padding-right: 5%;
-}
-
-#possibleDestinations svg.flag {
-  cursor: pointer;
-}
-
 /* Colour themes for the destination flags */
 .flagThemeBlack {
   --flag-theme: black;
diff --git a/server/src/assets/game/tableGenerator/.gitignore b/server/src/assets/game/tableGenerator/.gitignore
new file mode 100644
index 00000000..bdaab25d
--- /dev/null
+++ b/server/src/assets/game/tableGenerator/.gitignore
@@ -0,0 +1 @@
+env/
diff --git a/server/src/assets/game/tableGenerator/Readme.md b/server/src/assets/game/tableGenerator/Readme.md
index fc945f4f..9ea88200 100644
--- a/server/src/assets/game/tableGenerator/Readme.md
+++ b/server/src/assets/game/tableGenerator/Readme.md
@@ -7,6 +7,7 @@ The scripts will automatically find the shortest possible route from a valid sta
 
 ## Requirements
 * Python3
+* Python3 libraries: see `requirements.txt` in the same directory as this readme.
 * Configuration files for the model railway: (have to be located at `swtbahn-cli/configurations/<platformname>/<configfileshere>`, as the script tries to access them via relative paths)
     * Interlocking table (`interlocking_table.yml`)
     * extra configuration (`extras_config.yaml`)
diff --git a/server/src/assets/game/tableGenerator/flagMappings/swtbahn-full.csv b/server/src/assets/game/tableGenerator/flagMappings/swtbahn-full.csv
index ac57dba3..8b664040 100644
--- a/server/src/assets/game/tableGenerator/flagMappings/swtbahn-full.csv
+++ b/server/src/assets/game/tableGenerator/flagMappings/swtbahn-full.csv
@@ -11,7 +11,6 @@
 43,s5
 50,b1
 48,b2
-44,b3
 46,b4
 22,b5
 8,bw0
diff --git a/server/src/assets/game/tableGenerator/requirements.txt b/server/src/assets/game/tableGenerator/requirements.txt
new file mode 100644
index 00000000..8392d541
--- /dev/null
+++ b/server/src/assets/game/tableGenerator/requirements.txt
@@ -0,0 +1 @@
+PyYAML==6.0.2
diff --git a/server/src/assets/game/train-cargo-db.jpg b/server/src/assets/game/train-cargo-db.jpg
deleted file mode 100755
index 6594d8b0..00000000
Binary files a/server/src/assets/game/train-cargo-db.jpg and /dev/null differ
diff --git a/server/src/assets/game/train-cargo-green.jpg b/server/src/assets/game/train-cargo-green.jpg
deleted file mode 100755
index 474bbed5..00000000
Binary files a/server/src/assets/game/train-cargo-green.jpg and /dev/null differ
diff --git a/server/src/assets/game/train-regional-brengdirect.jpg b/server/src/assets/game/train-regional-brengdirect.jpg
deleted file mode 100644
index 3cc25aa2..00000000
Binary files a/server/src/assets/game/train-regional-brengdirect.jpg and /dev/null differ
diff --git a/server/src/assets/game/train-regional-odeg.jpg b/server/src/assets/game/train-regional-odeg.jpg
deleted file mode 100755
index 5acda0ab..00000000
Binary files a/server/src/assets/game/train-regional-odeg.jpg and /dev/null differ
diff --git a/server/src/assets/script-verificationtoggle.js b/server/src/assets/script-verificationtoggle.js
index ec254d96..a75509aa 100644
--- a/server/src/assets/script-verificationtoggle.js
+++ b/server/src/assets/script-verificationtoggle.js
@@ -10,12 +10,14 @@ function update_verification_url_display() {
 		url: '/monitor/verification-url',
 		crossDomain: true,
 		dataType: 'text',
-		success: function (responseData, textStatus, jqXHR) {
-			var ret = responseData.replace("verification-url: ", '');
-			$('#verificationUrlInUse').text(ret);
+		success: function (responseText) {
+			let respJson = JSON.parse(responseText);
+			$('#verificationUrlInUse').text(respJson["verification-url"]);
 		},
-		error: function (responseData, textStatus, errorThrown) {
+		error: function (jqXHR) {
 			$('#verificationUrlInUse').text("Unknown");
+			console.log("Getting the verification URL failed. jqXHR:");
+			console.log(jqXHR);
 		}
 	});
 }
@@ -27,25 +29,21 @@ function update_verification_toggle() {
 		url: '/monitor/verification-option',
 		crossDomain: true,
 		dataType: 'text',
-		success: function (responseData, textStatus, jqXHR) {
+		success: function (responseText) {
 			try {
 				// Mark toggle initialized
 				toggleInit = true;
-				if (responseData === "verification-enabled: true") {
-					current_toggle_pos = true;
-					$('#verificationToggle').prop('checked', true);
-				} else if (responseData === "verification-enabled: false") {
-					current_toggle_pos = false;
-					$('#verificationToggle').prop('checked', false);
-				}
+				let respJson = JSON.parse(responseText);
+				current_toggle_pos = respJson["verification-enabled"];
+				$('#verificationToggle').prop('checked', current_toggle_pos);
 			} catch (error) {
 				console.log("Failed to update Verification Toggle. Error Msg: " + error);
 			}
 		},
-		error: function (responseData, textStatus, errorThrown) {
+		error: function (jqXHR) {
 			// Mark as initialized on error as well, as else nothing about the toggle will work
 			toggleInit = true;
-			console.log("Update Verification Toggle error case, server response: " + responseData);
+			console.log("Update Verification Toggle error case, server response: " + jqXHR);
 		}
 	});
 }
@@ -69,9 +67,10 @@ function register_set_verification_server_url_button_onclick() {
 				$('#setVerificationServerUrlResponse').parent().removeClass('alert-danger');
 				$('#setVerificationServerUrlResponse').parent().addClass('alert-success');
 			},
-			error: function (responseData, textStatus, errorThrown) {
+			error: function (jqXHR) {
 				info_str = "Failed to set verification server url to " + verif_url + ".";
 				console.log(info_str);
+				console.log(jqXHR);
 				$('#setVerificationServerUrlResponse').parent().show();
 				$('#setVerificationServerUrlResponse').text(info_str);
 				$('#setVerificationServerUrlResponse').parent().removeClass('alert-success');
@@ -102,7 +101,7 @@ function register_verification_toggle_onchange() {
 			crossDomain: true,
 			data: { 'verification-option': toggleState },
 			dataType: 'text',
-			success: function (responseData, textStatus, jqXHR) {
+			success: function (responseText) {
 				info_str = (toggleState ? "Enabled" : "Disabled") + " verification.";
 				console.log(info_str);
 				$('#verificationSettingResponse').parent().show();
@@ -111,9 +110,10 @@ function register_verification_toggle_onchange() {
 				$('#verificationSettingResponse').parent().addClass('alert-success');
 				current_toggle_pos = toggleState;
 			},
-			error: function (responseData, textStatus, errorThrown) {
+			error: function (jqXHR) {
 				info_str = "Failed to " + (toggleState ? "enable" : "disable") + " verification.";
 				console.log(info_str);
+				console.log(jqXHR);
 				$('#verificationSettingResponse').parent().show();
 				$('#verificationSettingResponse').text(info_str);
 				$('#verificationSettingResponse').parent().removeClass('alert-success');
diff --git a/server/src/assets/script.js b/server/src/assets/script.js
index f35a986a..868f9b37 100644
--- a/server/src/assets/script.js
+++ b/server/src/assets/script.js
@@ -96,7 +96,7 @@ function updateTrainIsForwards() {
 }
 
 function updateTrainGrabbedState() {
-	// Called from client.html - TODO: Test if the return is needed.
+	// Called from client.html
 	return $.ajax({
 		type: 'GET',
 		url: '/monitor/trains',
@@ -117,6 +117,113 @@ function updateTrainGrabbedState() {
 	});
 }
 
+function getPointsWithCallbacks(successCallback, errorCallback) {
+	return $.ajax({
+		type: 'GET',
+		url: '/monitor/points',
+		crossDomain: true,
+		dataType: 'text',
+		success: (responseText) => {
+			successCallback(responseText);
+		},
+		error: (jqXHR) => {
+			errorCallback(jqXHR);
+		}
+	});
+}
+
+function addPointOptionsForSelectElems(htmlSelectElemIDs) {
+	return getPointsWithCallbacks(
+		// success callback
+		(responseText) => {
+			let responseJson = JSON.parse(responseText);
+			// Filter by existance
+			htmlSelectElemIDs = htmlSelectElemIDs.filter(selectElemID => $(selectElemID).length);
+			// clear the existing options
+			htmlSelectElemIDs.forEach(selectElemID => {
+				$(selectElemID).get(0).replaceChildren();
+			});
+			responseJson.points.sort((a, b) => {
+				let numA = parseInt(a.id.replace(/[^0-9]/g, ''));
+				let numB = parseInt(b.id.replace(/[^0-9]/g, ''));
+				return numA > numB;
+			});
+			// add option for each point for each select
+			for (const point of responseJson.points) {
+				htmlSelectElemIDs.forEach(selectElemID => {
+					let optElem = document.createElement("option");
+					optElem.text = point.id;
+					$(selectElemID).get(0).add(optElem);
+				});
+			}
+		},
+		(responseText, status) => {
+			console.log(`Error reading points of the SWTbahn platform, code ${jqXHR.status}, text ${jqXHR.responseText}`);
+			showErrorInElem("#loadAccessoriesResponse", getErrorMessage(jqXHR));
+		}
+	);
+}
+
+function getSignalsWithCallbacks(successCallback, errorCallback) {
+	return $.ajax({
+		type: 'GET',
+		url: '/monitor/signals',
+		crossDomain: true,
+		dataType: 'text',
+		success: (responseText) => {
+			successCallback(responseText);
+		},
+		error: (jqXHR) => {
+			errorCallback(jqXHR);
+		}
+	});
+}
+
+function addSignalOptionsForSelectElems(htmlSelectElemIDsNormal, htmlSelectElemIDsForRoutes) {
+	return getSignalsWithCallbacks(
+		// success callback
+		(responseText) => {
+			let responseJson = JSON.parse(responseText);
+			// Filter by existance
+			htmlSelectElemIDsNormal = htmlSelectElemIDsNormal.filter(selectElemID => $(selectElemID).length);
+			htmlSelectElemIDsForRoutes = htmlSelectElemIDsForRoutes.filter(selectElemID => $(selectElemID).length);
+
+			// clear the existing options
+			htmlSelectElemIDsNormal.forEach(selectElemID => $(selectElemID).get(0).replaceChildren());
+			htmlSelectElemIDsForRoutes.forEach(selectElemID => $(selectElemID).get(0).replaceChildren());
+
+			responseJson.signals.sort((a, b) => {
+				let numA = parseInt(a.id.replace(/[^0-9]/g, ''));
+				let numB = parseInt(b.id.replace(/[^0-9]/g, ''));
+				numA = a.id.includes("platform") ? numA + 100 : numA;
+				numB = b.id.includes("platform") ? numB + 100 : numB;
+				return numA > numB;
+			});
+
+			// add option for each signal for each select
+			for (const sig of responseJson.signals) {
+				// Omit the platformlights and distant signals for route signal dropdowns
+				if (!sig.id.includes("platform") && !sig.id.includes("b")) {
+					htmlSelectElemIDsForRoutes.forEach(selectElemID => {
+						let optElem = document.createElement("option");
+						optElem.text = sig.id;
+						$(selectElemID).get(0).add(optElem);
+					});
+				}
+				htmlSelectElemIDsNormal.forEach(selectElemID => {
+					let optElem = document.createElement("option");
+					optElem.text = sig.id;
+					$(selectElemID).get(0).add(optElem);
+				});
+			}
+		},
+		(jqXHR) => {
+			console.log(`Error reading signals of the SWTbahn platform, code ${jqXHR.status}, text ${jqXHR.responseText}`);
+			showErrorInElem("#loadAccessoriesResponse", getErrorMessage(jqXHR));
+		}
+	);
+}
+
 function updateGrantedRoutes(htmlElement) {
 	return $.ajax({
 		type: 'GET',
@@ -134,7 +241,7 @@ function updateGrantedRoutes(htmlElement) {
 				const routeId = route['id'];
 				const trainId = route.train;
 				const routeText = `route ${routeId} granted to ${trainId}`;
-				const releaseButton = `<button class="grantedRoute" value=${routeId}>Release</button>`;
+				const releaseButton = `<button class="grantedRoute btn smallerLineHeight btn-outline-primary" value=${routeId}>Release</button>`;
 				htmlElement.append(`<li>${routeText} ${releaseButton}</li>`);
 			});
 			$('.grantedRoute').click(function (event) {
@@ -485,11 +592,14 @@ function uploadEngine (file) {
 			console.log("Engine Upload Failed");
 			try {
 				var resJson = JSON.parse(jqXHR.responseText, null, 2);
+				console.log(resJson);
 				var msg = "Server Message: " + resJson["msg"];
-				msg += "\nList of Properties:"
-				resJson["verifiedproperties"].forEach(element => {
-					msg += "\n-" + element["property"]["name"] + ": " + element["verificationmessage"]
-				});
+				if (resJson.verifiedproperties) {
+					msg += "\nList of Properties:"
+					resJson.verifiedproperties.forEach(element => {
+						msg += "\n-" + element["property"]["name"] + ": " + element["verificationmessage"]
+					});
+				}
 				verificationObj = resJson;
 				showErrorInElem("#uploadResponse", msg);
 				$('#verificationLogDownloadButton').show();
@@ -686,6 +796,20 @@ $(document).ready(
 			shutdownServer();
 		});
 
+		// Loading Accessories
+
+		$('#loadAccessoriesButton').click(function () {
+			// IDs match where expected to across the 3 html's (client, controller, driver).
+			// The add...Options function takes care of omitting IDs that don't exist on the
+			// current page.
+			const signalDropDownIDs = ['#signalId'];
+			const signalDropDownIDsForRoutes = ['#signalIdFrom', '#signalIdTo'];
+			const pointDropDownIDs = ['#pointId'];
+			addSignalOptionsForSelectElems(signalDropDownIDs, signalDropDownIDsForRoutes)
+				.then(() => addPointOptionsForSelectElems(pointDropDownIDs))
+				.then(() => showInfoInElem('#loadAccessoriesResponse', 'Loaded'));
+		});
+
 		// Train Driver
 
 		$('#grabTrainButton').click(function () {
@@ -710,7 +834,7 @@ $(document).ready(
 			var speed = $('#dccSpeed').val();
 			var position = speeds.indexOf(speed);
 			if (position > 0) {
-				$('#dccSpeed:text').val(speeds[position - 1]);
+				$('#dccSpeed').val(speeds[position - 1]);
 			}
 		});
 
@@ -718,7 +842,7 @@ $(document).ready(
 			var speed = $('#dccSpeed').val();
 			var position = speeds.indexOf(speed);
 			if (position < speeds.length - 1) {
-				$('#dccSpeed:text').val(speeds[position + 1]);
+				$('#dccSpeed').val(speeds[position + 1]);
 			}
 		});
 
@@ -836,6 +960,8 @@ $(document).ready(
 			'cargo_db',
 			'cargo_green',
 			'cargo_bayern',
+			'cargo_g1000bb',
+			'perso_sbb',
 			'regional_odeg',
 			'regional_brengdirect'
 		];
diff --git a/server/src/assets/style.css b/server/src/assets/style.css
index 3dfd2a73..fe747abf 100644
--- a/server/src/assets/style.css
+++ b/server/src/assets/style.css
@@ -6,16 +6,16 @@ body {
 #swtLogo {
   background-image: url("swtbahn-logo.png");
   background-repeat: no-repeat;
-  background-size: auto 100px;
-  line-height: 165px;
+  background-size: auto 75px;
+  line-height: 140px;
   color: #054479;
-  height: 100px;
+  height: 75px;
   width: 100%;
 }
 
 #userLogo {
   text-align: right;
-  font-size: 45pt;
+  font-size: 35pt;
   font-weight: bold;
   color: #054479;
 }
@@ -30,3 +30,109 @@ body {
   cursor: pointer;
   margin-top: 1rem;
 }
+
+#verificationToggle {
+  margin-top: 0.5rem;
+}
+
+.alignedSpanForLine {
+  margin-left: 2% !important; 
+  display: flex; 
+  align-items: center; 
+  justify-content: center; 
+  line-height: 1.5;
+}
+
+.stdCardPadMarg {
+  padding: 0.5rem;
+  margin-bottom: 0.75rem;
+}
+
+.halfWJustifyHelper {
+  width: 45%;
+  margin: 0.25rem;
+}
+
+.thirdWJustifyHelper {
+  width: 30%;
+  margin: 0.25rem;
+}
+
+.btnPaddingReplicate {
+  /* Set the same paddings as the bootstrap btn has -> element height matches*/
+  padding-left: 0.75rem;
+  padding-right: 0.75rem;
+  padding-top: 0.375rem;
+  padding-bottom: 0.375rem;
+}
+
+.btnPaddingReplicateYOnly {
+  padding-top: 0.375rem;
+  padding-bottom: 0.375rem;
+}
+
+.smallerLineHeight {
+  line-height: 1;
+}
+
+.w-20 {
+  width: 20%;
+}
+
+.w-45 {
+  width: 45%;
+}
+
+.overviewSpeedInput {
+  /*I don't know exactly why, but input elements don't align well with buttons
+    by default. So the top/bot padding is a bit funky to align them well.
+  */
+  padding: .285rem .75rem;
+  background-clip: padding-box;
+  border: 1px solid #dee2e6;
+  border-radius: .375rem;
+  transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out;
+}
+
+.overviewTrainLineElem {
+  vertical-align: middle;
+  -webkit-box-sizing:border-box;
+  -moz-box-sizing:border-box;
+  box-sizing:border-box;
+}
+
+
+
+/* Tooltip adapted from w3schools.com/css/css_tooltip.asp */
+.tooltiptext {
+  visibility: hidden; /* Hidden by default */
+  background-color: #e0e0e0;
+  text-align: center;
+  padding: 0.5rem 0.5rem;
+  border-radius: 0.375rem;
+  position: absolute;
+  z-index: 1; /* Ensure tooltip is displayed above content */
+}
+
+.tooltipLoad:hover .tooltiptext {
+  visibility: visible;
+}
+
+.tooltip-top {
+  bottom: 25%;
+  left: 10%;
+  right: 10%;
+}
+
+.tooltip-top::after {
+  content: "";
+  position: absolute;
+  top: 100%;
+  left: 20%;
+  margin-left: 0.4rem;
+  border-width: 0.4rem;
+  border-style: solid;
+  border-color: #e0e0e0 transparent transparent transparent;
+}
+
+
diff --git a/server/src/engines/libtrain_engine_default (unremovable).so.forRasperryPi4AndOlder b/server/src/engines/libtrain_engine_default (unremovable).so.forRasperryPi4AndOlder
new file mode 100755
index 00000000..d6be5082
Binary files /dev/null and b/server/src/engines/libtrain_engine_default (unremovable).so.forRasperryPi4AndOlder differ
diff --git a/server/src/engines/libtrain_engine_linear (unremovable).so.forRasperryPi4AndOlder b/server/src/engines/libtrain_engine_linear (unremovable).so.forRasperryPi4AndOlder
new file mode 100755
index 00000000..be1aecce
Binary files /dev/null and b/server/src/engines/libtrain_engine_linear (unremovable).so.forRasperryPi4AndOlder differ
diff --git a/server/src/interlockers/libinterlocker_default (unremovable).so.forRasperryPi4AndOlder b/server/src/interlockers/libinterlocker_default (unremovable).so.forRasperryPi4AndOlder
new file mode 100755
index 00000000..7476a062
Binary files /dev/null and b/server/src/interlockers/libinterlocker_default (unremovable).so.forRasperryPi4AndOlder differ
diff --git a/server/src/interlockers/libinterlocker_simple_sectional (unremovable).so.forRasperryPi4AndOlder b/server/src/interlockers/libinterlocker_simple_sectional (unremovable).so.forRasperryPi4AndOlder
new file mode 100755
index 00000000..dcca0eac
Binary files /dev/null and b/server/src/interlockers/libinterlocker_simple_sectional (unremovable).so.forRasperryPi4AndOlder differ
diff --git a/server/test/unit/server_parser_tests.c b/server/test/unit/server_parser_tests.c
index 80df076f..3b1cbf0f 100644
--- a/server/test/unit/server_parser_tests.c
+++ b/server/test/unit/server_parser_tests.c
@@ -185,7 +185,7 @@ static void train_information(void **state) {
 	assert_string_equal(type, "cargo");
 	
 	float weight = config_get_scalar_float_value("train", "cargo_db", "weight");
-	assert_float_equal(weight, 100.0, 0.0);
+	assert_float_equal(weight, 77.0, 0.0);
 	
 	float length = config_get_scalar_float_value("train", "cargo_db", "length");
 	assert_float_equal(length, 13.0, 0.0);