diff --git a/frontend/src/components/Map.jsx b/frontend/src/components/Map.jsx
index 7b19baf..370df6c 100644
--- a/frontend/src/components/Map.jsx
+++ b/frontend/src/components/Map.jsx
@@ -30,7 +30,7 @@ class Map extends React.Component {
       <LeafletMap
         center={centerGermany}
         zoom={5}
-        style={{ width: '100vw', height: 'calc(50vh - 60px)', margin: 0, padding: 0, maxWidth: '100%' }}
+        style={{ margin: 0, padding: 0, height: '100%', width: '100%', maxWidth: '100%' }}
       >
         <TileLayer
           url="/map/tiles/{z}/{x}/{y}.png"
diff --git a/frontend/src/components/Toolbar.jsx b/frontend/src/components/Toolbar.jsx
index d4ace10..61d52c7 100644
--- a/frontend/src/components/Toolbar.jsx
+++ b/frontend/src/components/Toolbar.jsx
@@ -33,7 +33,7 @@ class MyToolbar extends React.Component {
   render() {
     return (
       <AppBar position="fixed">
-        <Toolbar>
+        <Toolbar id="toolbar" >
           <div style={{ width: "100%", display: "flex", justifyContent: "space-between", alignItems: "center" }}>
               <Typography variant="h6" color="inherit">
                 CCC Spaces
diff --git a/frontend/src/style/css/style.css b/frontend/src/style/css/style.css
index 076d769..83fc598 100644
--- a/frontend/src/style/css/style.css
+++ b/frontend/src/style/css/style.css
@@ -1,3 +1,29 @@
 body {
     background-color: #333333;
+}
+
+#indexContainer {
+  display: flex;
+  flex-direction: column;
+  height: 100vh;
+  margin-top: 60px;
+}
+
+@media (min-width: 680px) {
+  #indexContainer {
+    flex-direction: row;
+  }
+}
+
+@media (orientation: landscape) {
+  #toolbar {
+    min-height: 20px !important;
+    .MuiIconButton-root {
+      padding: 3px !important;
+    }
+  }
+
+  #indexContainer {
+    margin-top: 32px;
+  }
 }
\ No newline at end of file
diff --git a/frontend/src/views/Index.jsx b/frontend/src/views/Index.jsx
index f5274a6..68fad07 100644
--- a/frontend/src/views/Index.jsx
+++ b/frontend/src/views/Index.jsx
@@ -2,19 +2,15 @@ import React from 'react';
 import Map from '../components/Map';
 import EventList from '../components/EventList';
 
-const style = {
-  container: {
-    display: 'flex',
-    flexDirection: 'column',
-  },
-};
 
 const IndexContainer = () => (
-  <div style={style.container}>
-    <div style={{ height: 'calc(50vh - 60px)', paddingTop: '60px'}}>
+  <div id="indexContainer">
+    <div style={{ flex: 2 }}>
       <Map />
     </div>
-    <EventList />
+    <div style={{ flex: 2 }}>
+      <EventList />
+    </div>
   </div>
 );