5 files changed, 7 insertions, 4 deletions
diff --git a/src/components/sidebars/topology/rack/BackToRoomComponent.js b/src/components/sidebars/topology/rack/BackToRoomComponent.js
index 9bb719a3..252e95b7 100644
--- a/src/components/sidebars/topology/rack/BackToRoomComponent.js
+++ b/src/components/sidebars/topology/rack/BackToRoomComponent.js
@@ -1,7 +1,7 @@
 import React from "react";
 
 const BackToRoomComponent = ({onClick}) => (
-    <div className="btn btn-secondary btn-block" onClick={onClick}>
+    <div className="btn btn-secondary btn-block mb-2" onClick={onClick}>
         Back to room
     </div>
 );
diff --git a/src/components/sidebars/topology/rack/RackSidebarComponent.js b/src/components/sidebars/topology/rack/RackSidebarComponent.js
index 398b3c13..6a36972f 100644
--- a/src/components/sidebars/topology/rack/RackSidebarComponent.js
+++ b/src/components/sidebars/topology/rack/RackSidebarComponent.js
@@ -10,7 +10,7 @@ import "./RackSidebarComponent.css";
 const RackSidebarComponent = ({inSimulation, rackId}) => {
     return (
         <div className="rack-sidebar-container flex-column">
-            <div style={{flex: 0}}>
+            <div className="rack-sidebar-header-container">
                 <RackNameContainer/>
                 <BackToRoomContainer/>
                 {inSimulation ?
diff --git a/src/components/sidebars/topology/rack/RackSidebarComponent.sass b/src/components/sidebars/topology/rack/RackSidebarComponent.sass
index 192929cf..822804bc 100644
--- a/src/components/sidebars/topology/rack/RackSidebarComponent.sass
+++ b/src/components/sidebars/topology/rack/RackSidebarComponent.sass
@@ -3,6 +3,9 @@
   height: 100%
   max-height: 100%
 
+.rack-sidebar-header-container
+  flex: 0
+
 .machine-list-container
   flex: 1
   overflow-y: scroll
diff --git a/src/components/sidebars/topology/room/BackToBuildingComponent.js b/src/components/sidebars/topology/room/BackToBuildingComponent.js
index 12dc15dd..85d2adcd 100644
--- a/src/components/sidebars/topology/room/BackToBuildingComponent.js
+++ b/src/components/sidebars/topology/room/BackToBuildingComponent.js
@@ -1,7 +1,7 @@
 import React from "react";
 
 const BackToBuildingComponent = ({onClick}) => (
-    <div className="btn btn-secondary btn-block" onClick={onClick}>
+    <div className="btn btn-secondary btn-block mb-2" onClick={onClick}>
         Back to building
     </div>
 );
diff --git a/src/components/sidebars/topology/room/RoomSidebarComponent.js b/src/components/sidebars/topology/room/RoomSidebarComponent.js
index 04df4372..fb3c3296 100644
--- a/src/components/sidebars/topology/room/RoomSidebarComponent.js
+++ b/src/components/sidebars/topology/room/RoomSidebarComponent.js
@@ -16,8 +16,8 @@ const RoomSidebarComponent = ({roomId, roomType, inSimulation}) => {
     return (
         <div>
             <RoomNameContainer/>
-            <BackToBuildingContainer/>
             <RoomTypeContainer/>
+            <BackToBuildingContainer/>
             {inSimulation ?
                 <div>
                     <LoadBarContainer objectType="room" objectId={roomId}/>