diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index 2d1f5f5..97b0d82 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+- TMS-1070: Change lobby-display images, allow single exhibition to be in two spaces
+
 ## [1.3.9] - 2024-09-25
 
 - TMS-1067: Show price-info for event in listing if it's free
diff --git a/assets/images/aula/map_2nd_floor.png b/assets/images/aula/map_2nd_floor.png
index 4ddd2a4..0f0a93e 100644
Binary files a/assets/images/aula/map_2nd_floor.png and b/assets/images/aula/map_2nd_floor.png differ
diff --git a/assets/images/aula/map_2nd_floor_old.png b/assets/images/aula/map_2nd_floor_old.png
new file mode 100644
index 0000000..4ddd2a4
Binary files /dev/null and b/assets/images/aula/map_2nd_floor_old.png differ
diff --git a/assets/images/aula/map_3rd_floor.png b/assets/images/aula/map_3rd_floor.png
index 67d5510..7ec4619 100644
Binary files a/assets/images/aula/map_3rd_floor.png and b/assets/images/aula/map_3rd_floor.png differ
diff --git a/assets/images/aula/map_3rd_floor_old.png b/assets/images/aula/map_3rd_floor_old.png
new file mode 100644
index 0000000..67d5510
Binary files /dev/null and b/assets/images/aula/map_3rd_floor_old.png differ
diff --git a/assets/images/aula/map_basement.png b/assets/images/aula/map_basement.png
index d9c8841..c0f0bd2 100644
Binary files a/assets/images/aula/map_basement.png and b/assets/images/aula/map_basement.png differ
diff --git a/assets/images/aula/map_basement_old.png b/assets/images/aula/map_basement_old.png
new file mode 100644
index 0000000..d9c8841
Binary files /dev/null and b/assets/images/aula/map_basement_old.png differ
diff --git a/assets/images/aula/map_groundfloor.png b/assets/images/aula/map_groundfloor.png
index 27e265d..8ef4b70 100644
Binary files a/assets/images/aula/map_groundfloor.png and b/assets/images/aula/map_groundfloor.png differ
diff --git a/assets/images/aula/map_groundfloor_old.png b/assets/images/aula/map_groundfloor_old.png
new file mode 100644
index 0000000..27e265d
Binary files /dev/null and b/assets/images/aula/map_groundfloor_old.png differ
diff --git a/models/page-lobby-display.php b/models/page-lobby-display.php
index 95088e6..5a3d45f 100644
--- a/models/page-lobby-display.php
+++ b/models/page-lobby-display.php
@@ -15,7 +15,7 @@ class PageLobbyDisplay extends BaseModel {
      * @return string
      */
     public function font() {
-        return get_stylesheet_directory_uri() . '/assets/fonts/BebasNeue-Regular.ttf';
+        return \get_stylesheet_directory_uri() . '/assets/fonts/BebasNeue-Regular.ttf';
     }
 
     /**
@@ -25,19 +25,19 @@ public function font() {
      */
     public function lobby_images() {
         $images = [
-            'map_3rd_floor'   => get_stylesheet_directory_uri() . '/assets/images/aula/map_3rd_floor.png',
-            'third'           => get_stylesheet_directory_uri() . '/assets/images/aula/3rd.png',
-            'map_2nd_floor'   => get_stylesheet_directory_uri() . '/assets/images/aula/map_2nd_floor.png',
-            'second'          => get_stylesheet_directory_uri() . '/assets/images/aula/2nd.png',
-            'map_groundfloor' => get_stylesheet_directory_uri() . '/assets/images/aula/map_groundfloor.png',
-            'first'           => get_stylesheet_directory_uri() . '/assets/images/aula/1st.png',
-            'map_basement'    => get_stylesheet_directory_uri() . '/assets/images/aula/map_basement.png',
-            'basement'        => get_stylesheet_directory_uri() . '/assets/images/aula/basement.png',
-            'hallway'         => get_stylesheet_directory_uri() . '/assets/images/aula/hallway.png',
-            'food'            => get_stylesheet_directory_uri() . '/assets/images/aula/food.png',
-            'shop'            => get_stylesheet_directory_uri() . '/assets/images/aula/shop.png',
-            'loc_white'       => get_stylesheet_directory_uri() . '/assets/images/aula/loc_white.png',
-            'press'           => get_stylesheet_directory_uri() . '/assets/images/aula/press.png',
+            'map_3rd_floor'   => \get_stylesheet_directory_uri() . '/assets/images/aula/map_3rd_floor.png',
+            'third'           => \get_stylesheet_directory_uri() . '/assets/images/aula/3rd.png',
+            'map_2nd_floor'   => \get_stylesheet_directory_uri() . '/assets/images/aula/map_2nd_floor.png',
+            'second'          => \get_stylesheet_directory_uri() . '/assets/images/aula/2nd.png',
+            'map_groundfloor' => \get_stylesheet_directory_uri() . '/assets/images/aula/map_groundfloor.png',
+            'first'           => \get_stylesheet_directory_uri() . '/assets/images/aula/1st.png',
+            'map_basement'    => \get_stylesheet_directory_uri() . '/assets/images/aula/map_basement.png',
+            'basement'        => \get_stylesheet_directory_uri() . '/assets/images/aula/basement.png',
+            'hallway'         => \get_stylesheet_directory_uri() . '/assets/images/aula/hallway.png',
+            'food'            => \get_stylesheet_directory_uri() . '/assets/images/aula/food.png',
+            'shop'            => \get_stylesheet_directory_uri() . '/assets/images/aula/shop.png',
+            'loc_white'       => \get_stylesheet_directory_uri() . '/assets/images/aula/loc_white.png',
+            'press'           => \get_stylesheet_directory_uri() . '/assets/images/aula/press.png',
         ];
 
         return $images;
@@ -50,10 +50,10 @@ public function lobby_images() {
      */
     public function language_versions() {
         $language_versions = [
-            'en_url'     => get_the_permalink( pll_get_post( get_the_ID(), 'en' ) ),
-            'fi_url'     => get_the_permalink( pll_get_post( get_the_ID(), 'fi' ) ),
-            'current_fi' => pll_current_language() === 'fi' ? 'active' : '',
-            'current_en' => pll_current_language() === 'en' ? 'active' : '',
+            'en_url'     => \get_the_permalink( \pll_get_post( get_the_ID(), 'en' ) ),
+            'fi_url'     => \get_the_permalink( \pll_get_post( get_the_ID(), 'fi' ) ),
+            'current_fi' => \pll_current_language() === 'fi' ? 'active' : '',
+            'current_en' => \pll_current_language() === 'en' ? 'active' : '',
         ];
 
         return $language_versions;
@@ -87,14 +87,22 @@ public function lobby_exhibitions() {
         $query = new WP_Query( $args );
 
         return array_map( function ( $post ) {
-            $exhibition                = (object) get_fields( $post->ID );
-            $exhibition->title         = get_the_title( $post->ID );
-            $exhibition->image         = has_post_thumbnail( $post->ID ) ? get_the_post_thumbnail_url( $post->ID, 'medium_large' ) : null;
-            $exhibition->upcoming      = has_term( 'tulossa', 'exhibition-status', $post );
-            $exhibition->upcoming_text = __( 'Upcoming', 'tms-theme-vapriikki' );
-            $term_obj_list             = get_the_terms( $post->ID, 'exhibition-status' );
-            $terms_string              = join( '', wp_list_pluck( $term_obj_list, 'slug' ) );
-            $exhibition->terms_string  = str_replace( [ 'tulossa', 'arkisto', 'vaihtuvat', 'pysyvat' ], '', $terms_string );
+            $exhibition                = (object) \get_fields( $post->ID );
+            $exhibition->title         = \get_the_title( $post->ID );
+            $exhibition->image         = \has_post_thumbnail( $post->ID ) ? get_the_post_thumbnail_url( $post->ID, 'medium_large' ) : null;
+            $exhibition->upcoming      = \has_term( 'tulossa', 'exhibition-status', $post );
+            $exhibition->upcoming_text = \__( 'Upcoming', 'tms-theme-vapriikki' );
+            $term_obj_list             = \get_the_terms( $post->ID, 'exhibition-status' );
+            $terms_strings             = join( '_', \wp_list_pluck( $term_obj_list, 'slug' ) );
+            $terms_string              = str_replace( [ 'tulossa', 'arkisto', 'vaihtuvat', 'pysyvat' ], '', $terms_strings );
+            // Remove leading and trailing underscores
+            if ( str_starts_with( $terms_string, '_' ) ) {
+                $terms_string = substr( $terms_string, 1 );
+            }
+            if ( str_ends_with( $terms_string, '_' ) ) {
+                $terms_string = substr( $terms_string, 0, -1 );
+            }
+            $exhibition->terms_string  = $terms_string;
 
             return $exhibition;
 
diff --git a/partials/page-lobby-display.dust b/partials/page-lobby-display.dust
index 1db137c..195cce0 100644
--- a/partials/page-lobby-display.dust
+++ b/partials/page-lobby-display.dust
@@ -17,7 +17,7 @@
       font-family: "Bebas-Neue";
       font-display: swap;
       src: url({PageLobbyDisplay.font});
-    }    
+    }
 
 
     * { box-sizing: border-box; }
@@ -56,7 +56,6 @@
         padding: 1em 1em 0 1em;
     }
 
-    
     .exh_container .exhib .exhib_image img.inner_img {
         max-height: 50%;
         max-width: 85%;
@@ -110,14 +109,14 @@
       letter-spacing: 1px;
       font-size: 1.45em;
       -webkit-font-smoothing: antialiased;
-      text-rendering: optimizeLegibility;    
+      text-rendering: optimizeLegibility;
       width: 80%;
       padding-left: 1em;
       padding-right: 1em;
       padding-top: .8em;
       margin: 0.5em auto;
     }
- 
+
     .exh_container .exhib .exhib_image.static button {
       padding: 2% 3%;
     }
@@ -200,15 +199,15 @@
    .map_container .map_floor.map_one .floor_number img {
       margin-top: 3em;
     }
- 
+
    .map_container .map_floor.map_two .floor_number img {
       margin-top: 6em;
     }
- 
+
    .map_container .map_floor.map_three .floor_number img {
       margin-top: 15.2em;
     }
- 
+
    .map_container .map_floor.map_four .floor_number img {
       margin-top: 7em;
    }
@@ -244,7 +243,7 @@
    .map_container .map_floor.map_one img {
       width: 60%;
    }
-  
+
    .map_container .map_floor img {
       margin-top: 2rem;
       width: 80%;
@@ -354,23 +353,17 @@
      position: relative;
    }
 
-   .exh_container .exhib button .loc_wrapper.finlayson {
-    position: absolute;
-    right: 20%;
-    top: 4%;
-    z-index: 10000;
-    animation: bounce-in-bck 1.1s both;
-   }
-
-   .exh_container .exhib button .loc_wrapper.galleria {
+   .exh_container .exhib button .loc_wrapper.galleria,
+   .exh_container .exhib button .loc_wrapper_2.galleria {
     position: absolute;
-    right: 16.4%;
-    top: 27%;
+    right: 17%;
+    top: 31%;
     z-index: 10000;
     animation: bounce-in-bck 1.1s both;
   }
- 
-  .exh_container .exhib button .loc_wrapper.isosali {
+
+  .exh_container .exhib button .loc_wrapper.isosali,
+  .exh_container .exhib button .loc_wrapper_2.isosali {
     position: absolute;
     right: 18%;
     top: 56.2%;
@@ -378,7 +371,8 @@
     animation: bounce-in-bck 1.1s both;
   }
 
-  .exh_container .exhib button .loc_wrapper.jkm {
+  .exh_container .exhib button .loc_wrapper.jkm,
+  .exh_container .exhib button .loc_wrapper_2.jkm {
     position: absolute;
     right: 36%;
     top: 4%;
@@ -386,84 +380,142 @@
     animation: bounce-in-bck 1.1s both;
   }
 
-  .exh_container .exhib button .loc_wrapper.kellari {
+  .exh_container .exhib button .loc_wrapper.kellari,
+  .exh_container .exhib button .loc_wrapper_2.kellari {
     position: absolute;
-    right: 38%;
+    right: 38.5%;
     top: 81.5%;
     z-index: 10000;
     animation: bounce-in-bck 1.1s both;
   }
 
-  .exh_container .exhib button .loc_wrapper.kivimuseo {
+  .exh_container .exhib button .loc_wrapper.lumu,
+  .exh_container .exhib button .loc_wrapper_2.lumu {
     position: absolute;
-    right: 5.2%;
-    top: 46.4%;
+    right: 8%;
+    top: 27.5%;
     z-index: 10000;
     animation: bounce-in-bck 1.1s both;
   }
 
-  .exh_container .exhib button .loc_wrapper.lumu {
+  .exh_container .exhib button .loc_wrapper.pelimuseo,
+  .exh_container .exhib button .loc_wrapper_2.pelimuseo {
     position: absolute;
-    right: 12.6%;
-    top: 27.5%;
+    right: 29%;
+    top: 33%;
     z-index: 10000;
     animation: bounce-in-bck 1.1s both;
   }
 
-  .exh_container .exhib button .loc_wrapper.pelimuseo {
+  .exh_container .exhib button .loc_wrapper.postimuseo,
+  .exh_container .exhib button .loc_wrapper_2.postimuseo {
     position: absolute;
-    right: 33%;
-    top: 28%;
+    right: 41.5%;
+    top: 62%;
     z-index: 10000;
     animation: bounce-in-bck 1.1s both;
   }
 
-  .exh_container .exhib button .loc_wrapper.postimuseo {
+  .exh_container .exhib button .loc_wrapper.postimuseosecond,
+  .exh_container .exhib button .loc_wrapper_2.postimuseosecond {
     position: absolute;
-    right: 41.5%;
-    top: 26.5%;
+    right: 42.2%;
+    top: 28.5%;
+    z-index: 10000;
+    animation: bounce-in-bck 1.1s both;
+  }
+
+  .exh_container .exhib button .loc_wrapper.rupriikki,
+  .exh_container .exhib button .loc_wrapper_2.rupriikki {
+    position: absolute;
+    right: 21.2%;
+    top: 29%;
     z-index: 10000;
     animation: bounce-in-bck 1.1s both;
   }
 
-  .exh_container .exhib button .loc_wrapper.postimuseo_vv {
+  .exh_container .exhib button .loc_wrapper.kanavasali,
+  .exh_container .exhib button .loc_wrapper_2.kanavasali {
     position: absolute;
-    right: 39.3%;
-    top: 61.2%;
+    right: 15%;
+    top: 46%;
     z-index: 10000;
     animation: bounce-in-bck 1.1s both;
   }
 
-  .exh_container .exhib button .loc_wrapper.tampere {
+  .exh_container .exhib button .loc_wrapper.palikkalattia,
+  .exh_container .exhib button .loc_wrapper_2.palikkalattia {
     position: absolute;
-    right: 13.3%;
-    top: 44.4%;
+    right: 26%;
+    top: 26%;
     z-index: 10000;
     animation: bounce-in-bck 1.1s both;
   }
 
-  .exh_container .exhib button .loc_wrapper.rupriikki {
+  .exh_container .exhib button .loc_wrapper.paatygalleria,
+  .exh_container .exhib button .loc_wrapper_2.paatygalleria {
+    position: absolute;
+    right: 26%;
+    top: 26%;
+    z-index: 10000;
+    animation: bounce-in-bck 1.1s both;
+  }
+
+  .exh_container .exhib button .loc_wrapper.kokouskaytava,
+  .exh_container .exhib button .loc_wrapper_2.kokouskaytava {
+    position: absolute;
+    right: 38.2%;
+    top: 34%;
+    z-index: 10000;
+    animation: bounce-in-bck 1.1s both;
+  }
+
+  .exh_container .exhib button .loc_wrapper.areena,
+  .exh_container .exhib button .loc_wrapper_2.areena {
+    position: absolute;
+    right: 34%;
+    top: 30%;
+    z-index: 10000;
+    animation: bounce-in-bck 1.1s both;
+  }
+
+  .exh_container .exhib button .loc_wrapper.studio,
+  .exh_container .exhib button .loc_wrapper_2.studio {
+    position: absolute;
+    right: 34.3%;
+    top: 34.3%;
+    z-index: 10000;
+    animation: bounce-in-bck 1.1s both;
+  }
+
+  .exh_container .exhib button .loc_wrapper.ylasali,
+  .exh_container .exhib button .loc_wrapper_2.ylasali {
+    position: absolute;
+    right: 22%;
+    top: 4%;
+    z-index: 10000;
+    animation: bounce-in-bck 1.1s both;
+  }
+
+  .exh_container .exhib button .loc_wrapper.toimitila,
+  .exh_container .exhib button .loc_wrapper_2.toimitila {
     position: absolute;
     right: 23.2%;
-    top: 25.2%;
+    top: 46%;
     z-index: 10000;
     animation: bounce-in-bck 1.1s both;
   }
 
   .exh_container .exhib button .loc_wrapper.rupriikki .loc_outer_border,
   .exh_container .exhib button .loc_wrapper.rupriikki .loc_inner_border,
-  .exh_container .exhib button .loc_wrapper.tampere .loc_outer_border,
-  .exh_container .exhib button .loc_wrapper.tampere .loc_inner_border,
-  .exh_container .exhib button .loc_wrapper.postimuseo_vv .loc_outer_border,
-  .exh_container .exhib button .loc_wrapper.postimuseo_vv .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper.postimuseosecond .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper.postimuseosecond .loc_inner_border,
   .exh_container .exhib button .loc_wrapper.postimuseo .loc_outer_border,
   .exh_container .exhib button .loc_wrapper.postimuseo .loc_inner_border,
   .exh_container .exhib button .loc_wrapper.pelimuseo .loc_outer_border,
   .exh_container .exhib button .loc_wrapper.pelimuseo .loc_inner_border,
   .exh_container .exhib button .loc_wrapper.lumu .loc_outer_border,
   .exh_container .exhib button .loc_wrapper.lumu .loc_inner_border,
-  .exh_container .exhib button .loc_wrapper.kivimuseo .loc_outer_border,
-  .exh_container .exhib button .loc_wrapper.kivimuseo .loc_inner_border,
   .exh_container .exhib button .loc_wrapper.kellari .loc_outer_border,
   .exh_container .exhib button .loc_wrapper.kellari .loc_inner_border,
   .exh_container .exhib button .loc_wrapper.jkm .loc_outer_border,
@@ -472,8 +524,56 @@
   .exh_container .exhib button .loc_wrapper.isosali .loc_inner_border,
   .exh_container .exhib button .loc_wrapper.galleria .loc_outer_border,
   .exh_container .exhib button .loc_wrapper.galleria .loc_inner_border,
-  .exh_container .exhib button .loc_wrapper.finlayson .loc_outer_border,
-  .exh_container .exhib button .loc_wrapper.finlayson .loc_inner_border {
+  .exh_container .exhib button .loc_wrapper.kanavasali .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper.kanavasali .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper.palikkalattia .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper.palikkalattia .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper.paatygalleria .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper.paatygalleria .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper.kokouskaytava .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper.kokouskaytava .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper.areena .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper.areena .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper.studio .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper.studio .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper.ylasali .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper.ylasali .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper.toimitila .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper.toimitila .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.rupriikki .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.rupriikki .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.postimuseosecond .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.postimuseosecond .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.postimuseo .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.postimuseo .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.pelimuseo .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.pelimuseo .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.lumu .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.lumu .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.kellari .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.kellari .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.jkm .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.jkm .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.isosali .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.isosali .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.galleria .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.galleria .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.kanavasali .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.kanavasali .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.palikkalattia .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.palikkalattia .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.paatygalleria .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.paatygalleria .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.kokouskaytava .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.kokouskaytava .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.areena .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.areena .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.studio .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.studio .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.ylasali .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.ylasali .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.toimitila .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.toimitila .loc_inner_border {
     display: block;
     position: relative;
     z-index: 15000;
@@ -482,48 +582,114 @@
   }
 
   .exh_container .exhib button .loc_wrapper.rupriikki .loc_outer_border,
-  .exh_container .exhib button .loc_wrapper.tampere .loc_outer_border,
-  .exh_container .exhib button .loc_wrapper.postimuseo_vv .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper.postimuseosecond .loc_outer_border,
   .exh_container .exhib button .loc_wrapper.postimuseo .loc_outer_border,
   .exh_container .exhib button .loc_wrapper.pelimuseo .loc_outer_border,
   .exh_container .exhib button .loc_wrapper.lumu .loc_outer_border,
-  .exh_container .exhib button .loc_wrapper.kivimuseo .loc_outer_border,
   .exh_container .exhib button .loc_wrapper.kellari .loc_outer_border,
   .exh_container .exhib button .loc_wrapper.jkm .loc_outer_border,
   .exh_container .exhib button .loc_wrapper.isosali .loc_outer_border,
   .exh_container .exhib button .loc_wrapper.galleria .loc_outer_border,
-  .exh_container .exhib button .loc_wrapper.finlayson .loc_outer_border {
+  .exh_container .exhib button .loc_wrapper.kanavasali .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper.palikkalattia .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper.paatygalleria .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper.kokouskaytava .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper.areena .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper.studio .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper.ylasali .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper.toimitila .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.rupriikki .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.postimuseosecond .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.postimuseo .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.pelimuseo .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.lumu .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.kellari .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.jkm .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.isosali .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.galleria .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.kanavasali .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.palikkalattia .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.paatygalleria .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.kokouskaytava .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.areena .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.studio .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.ylasali .loc_outer_border,
+  .exh_container .exhib button .loc_wrapper_2.toimitila .loc_outer_border {
     animation: pulsate_test_outer 1.7s ease-in infinite;
 
   }
 
   .exh_container .exhib button .loc_wrapper.rupriikki .loc_inner_border,
-  .exh_container .exhib button .loc_wrapper.tampere .loc_inner_border,
-  .exh_container .exhib button .loc_wrapper.postimuseo_vv .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper.postimuseosecond .loc_inner_border,
   .exh_container .exhib button .loc_wrapper.postimuseo .loc_inner_border,
   .exh_container .exhib button .loc_wrapper.pelimuseo .loc_inner_border,
   .exh_container .exhib button .loc_wrapper.lumu .loc_inner_border,
-  .exh_container .exhib button .loc_wrapper.kivimuseo .loc_inner_border,
   .exh_container .exhib button .loc_wrapper.kellari .loc_inner_border,
   .exh_container .exhib button .loc_wrapper.jkm .loc_inner_border,
   .exh_container .exhib button .loc_wrapper.isosali .loc_inner_border,
   .exh_container .exhib button .loc_wrapper.galleria .loc_inner_border,
-  .exh_container .exhib button .loc_wrapper.finlayson .loc_inner_border {
+  .exh_container .exhib button .loc_wrapper.kanavasali .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper.palikkalattia .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper.paatygalleria .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper.kokouskaytava .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper.areena .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper.studio .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper.ylasali .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper.toimitila .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.rupriikki .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.postimuseosecond .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.postimuseo .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.pelimuseo .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.lumu .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.kellari .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.jkm .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.isosali .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.galleria .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.kanavasali .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.palikkalattia .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.paatygalleria .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.kokouskaytava .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.areena .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.studio .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.ylasali .loc_inner_border,
+  .exh_container .exhib button .loc_wrapper_2.toimitila .loc_inner_border {
     animation: pulsate_test 1.7s ease-in infinite;
   }
 
   .exh_container .exhib button .loc_wrapper.rupriikki .loc_inner_border img,
-  .exh_container .exhib button .loc_wrapper.tampere .loc_inner_border img,
-  .exh_container .exhib button .loc_wrapper.postimuseo_vv .loc_inner_border img,
+  .exh_container .exhib button .loc_wrapper.postimuseosecond .loc_inner_border img,
   .exh_container .exhib button .loc_wrapper.postimuseo .loc_inner_border img,
   .exh_container .exhib button .loc_wrapper.pelimuseo .loc_inner_border img,
   .exh_container .exhib button .loc_wrapper.lumu .loc_inner_border img,
-  .exh_container .exhib button .loc_wrapper.kivimuseo .loc_inner_border img,
   .exh_container .exhib button .loc_wrapper.kellari .loc_inner_border img,
   .exh_container .exhib button .loc_wrapper.jkm .loc_inner_border img,
   .exh_container .exhib button .loc_wrapper.isosali .loc_inner_border img,
   .exh_container .exhib button .loc_wrapper.galleria .loc_inner_border img,
-  .exh_container .exhib button .loc_wrapper.finlayson .loc_inner_border img {
+  .exh_container .exhib button .loc_wrapper.kanavasali .loc_inner_border img,
+  .exh_container .exhib button .loc_wrapper.palikkalattia .loc_inner_border img,
+  .exh_container .exhib button .loc_wrapper.paatygalleria .loc_inner_border img,
+  .exh_container .exhib button .loc_wrapper.kokouskaytava .loc_inner_border img,
+  .exh_container .exhib button .loc_wrapper.areena .loc_inner_border img,
+  .exh_container .exhib button .loc_wrapper.studio .loc_inner_border img,
+  .exh_container .exhib button .loc_wrapper.ylasali .loc_inner_border img,
+  .exh_container .exhib button .loc_wrapper.toimitila .loc_inner_border img,
+  .exh_container .exhib button .loc_wrapper_2.rupriikki .loc_inner_border img,
+  .exh_container .exhib button .loc_wrapper_2.postimuseosecond .loc_inner_border img,
+  .exh_container .exhib button .loc_wrapper_2.postimuseo .loc_inner_border img,
+  .exh_container .exhib button .loc_wrapper_2.pelimuseo .loc_inner_border img,
+  .exh_container .exhib button .loc_wrapper_2.lumu .loc_inner_border img,
+  .exh_container .exhib button .loc_wrapper_2.kellari .loc_inner_border img,
+  .exh_container .exhib button .loc_wrapper_2.jkm .loc_inner_border img,
+  .exh_container .exhib button .loc_wrapper_2.isosali .loc_inner_border img,
+  .exh_container .exhib button .loc_wrapper_2.galleria .loc_inner_border img,
+  .exh_container .exhib button .loc_wrapper_2.kanavasali .loc_inner_border img,
+  .exh_container .exhib button .loc_wrapper_2.palikkalattia .loc_inner_border img,
+  .exh_container .exhib button .loc_wrapper_2.paatygalleria .loc_inner_border img,
+  .exh_container .exhib button .loc_wrapper_2.kokouskaytava .loc_inner_border img,
+  .exh_container .exhib button .loc_wrapper_2.areena .loc_inner_border img,
+  .exh_container .exhib button .loc_wrapper_2.studio .loc_inner_border img,
+  .exh_container .exhib button .loc_wrapper_2.ylasali .loc_inner_border img,
+  .exh_container .exhib button .loc_wrapper_2.toimitila .loc_inner_border img {
     position: relative;
     top: 0;
     right: 0;
@@ -574,7 +740,7 @@
         transform: rotateY(-180deg);
         filter: brightness(100%);
       }
-      
+
       75% {
         -moz-transform: rotateY(-270deg);
         -ms-transform: rotateY(-270deg);
@@ -733,6 +899,13 @@
                       </div>
                     </div>
                   </div>
+                  <div class="loc_wrapper_2">
+                    <div class="loc_outer_border">
+                      <div class="loc_inner_border">
+                        <img class="loc" src="{lobby_images.loc_white|url}"/>
+                      </div>
+                    </div>
+                  </div>
                   </button>
 
               </div>
@@ -776,14 +949,24 @@
 
           var parentClicked = e.target;
           var parentButton = parentClicked.querySelector('.directions_button');
-          var showthis = parentButton.value;
+          var valuesArray = parentButton.value.split( '_' );
           var parentContainer = parentButton.parentNode;
           var resetContainers = document.querySelectorAll('.exhib_image');
           var resetTargets = document.querySelectorAll('.directions_button');
           var resetImages = document.querySelectorAll('.loc_wrapper');
+          var resetImagesSecond = document.querySelectorAll('.loc_wrapper_2');
           var lastChild = parentButton.querySelector('.loc_wrapper');
+          var lastChildSecond = parentButton.querySelector('.loc_wrapper_2');
+          if ( valuesArray.length > 1 ) {
+            var hasMultiple = true;
+            lastChildSecond.style.display = 'block';
+          }
+          else {
+            var hasMultiple = false;
+            lastChildSecond.style.display = 'none';
+          }
           console.log("parent clicked:"+parentClicked);
-          console.log("showthis value:"+showthis);
+          console.log("showthis values array:"+valuesArray);
           console.log("parent button:"+parentButton);
           console.log("parent container:"+parentContainer);
           console.log("last child:"+lastChild);
@@ -794,13 +977,22 @@
             resetImages[i].classList.remove(...resetImages[i].classList);
             resetImages[i].classList.add('loc_wrapper');
           }
+          for(i = 0; i < resetImagesSecond.length; i++) {
+            resetImagesSecond[i].classList.remove(...resetImagesSecond[i].classList);
+            resetImagesSecond[i].classList.add('loc_wrapper_2');
+          }
           for(i = 0; i < resetTargets.length; i++) {
             resetTargets[i].classList.add('relative');
           }
           parentContainer.classList.add('active');
-          lastChild.classList.add(showthis);
+          lastChild.classList.add(valuesArray[0]);
           lastChild.classList.add('bounce-in-bck');
 
+          if ( hasMultiple === true ) {
+            lastChildSecond.classList.add(valuesArray[1]);
+            lastChildSecond.classList.add('bounce-in-bck');
+          }
+
           parentButton.classList.remove('relative');
           console.log(lastChild);