diff --git a/src/style.scss b/src/style.scss
index 4c18a7b..b5c61c9 100644
--- a/src/style.scss
+++ b/src/style.scss
@@ -1,7 +1,3 @@
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
-
-.min-h-half {
-  min-height: 50%;
-}
diff --git a/src/views/building/floors/FloorView.vue b/src/views/building/floors/FloorView.vue
index 2dd37fb..2aa57a9 100644
--- a/src/views/building/floors/FloorView.vue
+++ b/src/views/building/floors/FloorView.vue
@@ -21,55 +21,99 @@
     </template>
   </PageHead>
 
-  <HousePlanner
-    v-if="floorDocument"
-    :key="`fdoc${floorDocument.id}`"
-    ref="canvas"
-    class="h-[70vh]"
-    :editable="false"
-    :grid="false"
-    transparent
-    headless
-    :floor-document="floorDocument"
-    @click="clickOnRoom()"
+  <button
+    @click="showMap = !showMap"
+    :class="[
+      showMap ? 'bg-gray-100' : 'rounded-md ring-1 ring-black ring-opacity-5',
+      'ml-auto flex items-center space-x-2 rounded-tl-lg rounded-tr-lg px-2 py-2 shadow-md',
+    ]"
   >
-    <template v-for="room of rooms">
-      <div
-        v-if="!highlighted || highlighted.id === room.id"
-        :class="[
-          highlighted
-            ? ''
-            : 'flex cursor-pointer items-center justify-center transition-transform hover:scale-105',
-          'pointer-events-auto absolute',
-        ]"
-        @click.stop="clickOnRoom(room)"
-        :style="getRoomPositionCSS(room)"
+    <span class="sr-only">{ showMap ? 'Hide' : 'Show' }}</span> Floor plan
+    <ChevronUpIcon v-if="showMap" class="h-4 w-4" />
+    <ChevronDownIcon v-else class="h-4 w-4" />
+  </button>
+
+  <Transition
+    name="menu-transition"
+    enter-active-class="transition-height ease-out duration-200"
+    enter-from-class="h-0"
+    enter-to-class="h-[70vh]"
+    leave-active-class="transition-height ease-in duration-150"
+    leave-from-class="h-[70vh]"
+    leave-to-class="h-0"
+  >
+    <div v-if="showMap" class="z-10 overflow-hidden bg-gray-100 shadow-md">
+      <HousePlanner
+        v-if="floorDocument"
+        :key="`fdoc${floorDocument.id}`"
+        ref="canvas"
+        class="h-[70vh]"
+        :editable="false"
+        :grid="false"
+        transparent
+        headless
+        :floor-document="floorDocument"
+        @click="clickOnRoom(undefined, $event)"
       >
-        <div class="absolute" :style="getRoomPolygonCSS(room)"></div>
-        <span class="pointer-events-none" v-if="!highlighted">{{
-          room.displayName
-        }}</span>
-        <template v-if="highlighted?.id === room.id">
-          <template v-for="storage of storages">
-            <div
-              class="custom-storage absolute"
-              :style="getStoragePosition(storage)"
+        <RoomPolygon
+          v-for="room of rooms"
+          :room="room"
+          :highlighted="selectedRoom?.id"
+          @clicked-in="(ev) => clickOnRoom(room, ev)"
+        >
+          <template v-if="selectedRoom?.id === room.id">
+            <StorageBubble
+              :storage="storage"
+              v-for="storage of storages"
+              :class="{ 'z-20': storage.id === hoveredBubble }"
+              @mouseenter="() => (hoveredBubble = storage.id)"
+              @mouseleave="() => (hoveredBubble = undefined)"
             >
-              <div
-                class="absolute bottom-2 left-1/2 h-20 w-20 -translate-x-1/2 rounded-lg bg-blue-400 px-2 py-2"
-              >
-                <span>{{ storage.displayName }}</span>
-                <div
-                  class="absolute -bottom-2 left-1/2 h-0 w-0 -translate-x-1/2 border-x-8 border-t-[16px] border-x-transparent border-t-blue-400"
-                ></div>
-              </div>
-            </div>
+              <span class="text-md font-bold">{{ storage.displayName }}</span>
+              <span class="text-sm">Stored items: {{ storage.itemCount }}</span>
+            </StorageBubble>
           </template>
-        </template></div
-    ></template>
-  </HousePlanner>
+        </RoomPolygon>
+      </HousePlanner>
+    </div>
+  </Transition>
+
+  <div class="grid grid-cols-3">
+    <div class="flex flex-col">
+      <button
+        v-for="room of rooms"
+        @click="selectRoomFromList(room)"
+        :class="[
+          selectedRoom?.id === room.id
+            ? 'bg-blue-100 hover:bg-blue-200'
+            : 'hover:bg-blue-100',
+          'flex items-center justify-between border-b-2 border-gray-100 py-2 px-2',
+        ]"
+      >
+        {{ room.displayName }} <ChevronRightIcon class="h-4 w-4" />
+      </button>
+    </div>
+
+    <div class="flex flex-col" v-if="selectedRoom?.id">
+      <button
+        v-for="storage of storages"
+        :class="[
+          'hover:bg-blue-100',
+          'flex items-center justify-between border-b-2 border-gray-100 py-2 px-2',
+        ]"
+      >
+        {{ storage.displayName }} ({{ storage.itemCount }})
+        <ChevronRightIcon class="h-4 w-4" />
+      </button>
+    </div>
+  </div>
 </template>
 <script setup lang="ts">
+import {
+  ChevronDownIcon,
+  ChevronRightIcon,
+  ChevronUpIcon,
+} from '@heroicons/vue/24/outline';
 import { storeToRefs } from 'pinia';
 import PageHead from '../../../components/PageHead.vue';
 import { useRoute } from 'vue-router';
@@ -84,14 +128,20 @@ import jfetch from '../../../utils/jfetch';
 import { BACKEND_URL } from '../../../constants';
 import { useAccessToken } from '../../../composables/useAccessToken';
 import { StorageListItem } from '../../../interfaces/storage.interfaces';
+import StorageBubble from './StorageBubble.vue';
+import RoomPolygon from './RoomPolygon.vue';
+import { useLocalStorage } from '@vueuse/core';
 
 const route = useRoute();
 const buildingStore = useBuildingStore();
 const { building } = storeToRefs(buildingStore);
 const { authHeader } = useAccessToken();
 const canvas = ref<InstanceType<typeof HousePlanner>>();
-const highlighted = ref<RoomLayoutObject>();
 const storages = ref<StorageListItem[]>([]);
+const selectedRoom = ref<RoomLayoutObject>();
+const showMap = useLocalStorage('showRoomMap', true, { writeDefaults: false });
+const hoveredBubble = ref<number>();
+const selectedStorage = ref<number>();
 
 const floor = computed(() =>
   building.value?.floors.find(
@@ -103,14 +153,30 @@ const floorDocument = computed(
   () => floor.value?.plan && JSON.parse(floor.value.plan)
 );
 
-const clickOnRoom = (room?: RoomLayoutObject) => {
+const roomCoordinate = (ev: MouseEvent) => {
+  const rect = (ev.target as HTMLElement).getBoundingClientRect();
+  const [x, y] = [ev.clientX - rect.left, ev.clientY - rect.top];
+  console.log(x, y);
+};
+
+const clickOnRoom = (room: RoomLayoutObject | undefined, ev: MouseEvent) => {
   canvas.value?.setViewRectangle(room?.boundingBox);
-  if (room && !highlighted.value) {
+  selectedStorage.value = undefined;
+  if (room && (!selectedRoom.value || room.id !== selectedRoom.value?.id)) {
     getRoomStorages(room);
-  } else if (!room && highlighted.value) {
+  } else if (room?.id == selectedRoom.value?.id) {
+    roomCoordinate(ev);
+  } else {
     storages.value = [];
   }
-  highlighted.value = room;
+  selectedRoom.value = room;
+};
+
+const selectRoomFromList = (room: RoomLayoutObject) => {
+  canvas.value?.setViewRectangle(room?.boundingBox);
+  selectedStorage.value = undefined;
+  getRoomStorages(room);
+  selectedRoom.value = room;
 };
 
 const rooms = computed<RoomLayoutObject[]>(
@@ -134,38 +200,8 @@ const rooms = computed<RoomLayoutObject[]>(
     []
 );
 
-const getRoomPolygonCSS = (room: RoomLayoutObject) => {
-  const [min, max] = room.boundingBox;
-  return {
-    clipPath: `polygon(${room.plan
-      .map((point) => `${point[0] - min[0]}px ${point[1] - min[1]}px`)
-      .join(', ')})`,
-    width: `${max[0] - min[0]}px`,
-    height: `${max[1] - min[1]}px`,
-    backgroundColor: 'rgb(40 180 255 / 40%)',
-  };
-};
-
-const getRoomPositionCSS = (room: RoomLayoutObject) => {
-  const [min, max] = room.boundingBox;
-  return {
-    top: `${min[1]}px`,
-    left: `${min[0]}px`,
-    width: `${max[0] - min[0]}px`,
-    height: `${max[1] - min[1]}px`,
-  };
-};
-const getStoragePosition = (storage: any) => {
-  const locationSplit = storage.location
-    .split(',')
-    .map((int: string) => `${int}px`);
-  return {
-    left: locationSplit[0],
-    top: locationSplit[1],
-  };
-};
-
 const getRoomStorages = async (room: RoomLayoutObject) => {
+  storages.value = [];
   try {
     const { data: storageList } = await jfetch(
       `${BACKEND_URL}/storage/room/${room.id}?includeWithSets=false`,
@@ -185,8 +221,3 @@ const getRoomStorages = async (room: RoomLayoutObject) => {
   }
 };
 </script>
-
-<style scoped lang="scss">
-.custom-storage {
-}
-</style>
diff --git a/src/views/building/floors/RoomPolygon.vue b/src/views/building/floors/RoomPolygon.vue
new file mode 100644
index 0000000..ace72e4
--- /dev/null
+++ b/src/views/building/floors/RoomPolygon.vue
@@ -0,0 +1,62 @@
+<template>
+  <div
+    v-if="!highlighted || highlighted === room.id"
+    :class="[
+      highlighted
+        ? ''
+        : 'flex cursor-pointer items-center justify-center transition-transform hover:scale-105',
+      'pointer-events-auto absolute',
+    ]"
+    :style="roomPositionCSS"
+  >
+    <div
+      class="absolute"
+      :style="roomPolygonCSS"
+      @click.stop="clickOnRoom($event)"
+    ></div>
+    <span class="pointer-events-none z-10" v-if="!highlighted">{{
+      room.displayName
+    }}</span>
+    <slot />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue';
+import { RoomLayoutObject } from '../../../interfaces/room.interfaces';
+
+const props = defineProps<{
+  room: RoomLayoutObject;
+  highlighted?: number;
+}>();
+
+const emit = defineEmits<{
+  (e: 'clickedIn', ev: MouseEvent): void;
+}>();
+
+const clickOnRoom = (ev: MouseEvent) => emit('clickedIn', ev);
+
+const roomPolygonCSS = computed(() => {
+  if (!props.room) return {};
+  const [min, max] = props.room.boundingBox;
+  return {
+    clipPath: `polygon(${props.room.plan
+      .map((point) => `${point[0] - min[0]}px ${point[1] - min[1]}px`)
+      .join(', ')})`,
+    width: `${max[0] - min[0]}px`,
+    height: `${max[1] - min[1]}px`,
+    backgroundColor: 'rgb(40 180 255 / 40%)',
+  };
+});
+
+const roomPositionCSS = computed(() => {
+  if (!props.room) return {};
+  const [min, max] = props.room.boundingBox;
+  return {
+    top: `${min[1]}px`,
+    left: `${min[0]}px`,
+    width: `${max[0] - min[0]}px`,
+    height: `${max[1] - min[1]}px`,
+  };
+});
+</script>
diff --git a/src/views/building/floors/StorageBubble.vue b/src/views/building/floors/StorageBubble.vue
new file mode 100644
index 0000000..85d136b
--- /dev/null
+++ b/src/views/building/floors/StorageBubble.vue
@@ -0,0 +1,35 @@
+<template>
+  <div
+    class="custom-storage absolute z-10"
+    :style="getStoragePosition(storage)"
+  >
+    <div
+      class="absolute bottom-2 left-1/2 h-20 w-60 -translate-x-1/2 rounded-lg bg-white px-2 py-2 shadow-lg ring-1 ring-black ring-opacity-5"
+    >
+      <div class="flex flex-col">
+        <slot />
+      </div>
+      <div
+        class="absolute -bottom-2 left-1/2 h-0 w-0 -translate-x-1/2 border-x-8 border-t-[16px] border-x-transparent border-t-white"
+      ></div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { StorageListItem } from '../../../interfaces/storage.interfaces';
+
+const props = defineProps<{
+  storage: StorageListItem;
+}>();
+
+const getStoragePosition = (storage: any) => {
+  const locationSplit = storage.location
+    .split(',')
+    .map((int: string) => `${int}px`);
+  return {
+    left: locationSplit[0],
+    top: locationSplit[1],
+  };
+};
+</script>