diff --git a/src/app.tsx b/src/app.tsx
index 1b424e06797127d8b1d46ef0c42dcf9842ed1ddc..c90903d4df6cec9c7dd7b980b1e71c571d4f2a5a 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -119,7 +119,7 @@ import Chat404 from './components/404internal/Chat404'
 const mapStateToProps = (rootState: RootState) => {
   return {
     userId: rootState.userDataSettingsSate.userData.id,
-    isSiteHeaderBarDisplayed: rootState.siteHeaderBarState.isSiteHeaderBarDisplayedAndEnabled,
+    isSiteHeaderBarDisplayedAndEnabled: rootState.siteHeaderBarState.isSiteHeaderBarDisplayedAndEnabled,
     isSiteHeaderBarCollapsed: rootState.siteHeaderBarState.isSiteHeaderBarCollapsed,
     isAddUsersDialogDisplayed: rootState.singleGroupState.isAddUsersDialogDisplayed,
     isLogginOut: rootState.siteHeaderBarState.isLoggingOut,
@@ -154,7 +154,7 @@ class App extends React.Component<Props, any> {
 
 
         <div
-          className={this.props.isSiteHeaderBarDisplayed && !this.props.isSiteHeaderBarCollapsed
+          className={this.props.isSiteHeaderBarDisplayedAndEnabled && !this.props.isSiteHeaderBarCollapsed
                      ? 'fh site-content'
                      : 'fh site-content-no-site-header-bar'}>
           <div className="fh relative-positioned">
diff --git a/src/components/commonHeaderBar/commonHeaderBar.tsx b/src/components/commonHeaderBar/commonHeaderBar.tsx
index 774bd3d5fb339d89f27c21ff205ca52b66562799..37e637630e9e525dcaeaceef16cab529bcda3e3b 100644
--- a/src/components/commonHeaderBar/commonHeaderBar.tsx
+++ b/src/components/commonHeaderBar/commonHeaderBar.tsx
@@ -19,7 +19,7 @@ const mapStateToProps = (rootState: RootState /*, props: MyProps*/) => {
   return {
     //test0: rootState...
     //test: props.test
-    isSiteHeaderBarDisplayed: rootState.siteHeaderBarState.isSiteHeaderBarDisplayedAndEnabled,
+    isSiteHeaderBarDisplayedAndEnabled: rootState.siteHeaderBarState.isSiteHeaderBarDisplayedAndEnabled,
     isSiteHeaderBarCollapsed: rootState.siteHeaderBarState.isSiteHeaderBarCollapsed,
     isSubHeaderBarCollapsed: rootState.siteHeaderBarState.isSubHeaderBarCollapsed,
   }
@@ -42,10 +42,9 @@ class commonHeaderBar extends React.Component<Props, any> {
     return (
       <div className="site-content-header-outer">
         {
-          !this.props.isSubHeaderBarCollapsed &&
           <div>
             <div
-              className={this.props.isSiteHeaderBarDisplayed && !this.props.isSiteHeaderBarCollapsed ? "site-content-header" : 'site-content-header-no-site-header-bar'}>
+              className={`${this.props.isSiteHeaderBarDisplayedAndEnabled && !this.props.isSiteHeaderBarCollapsed ? 'site-content-header' : 'site-content-header-no-site-header-bar'}${this.props.isSubHeaderBarCollapsed ? ' collapsed-i' : ''}`}>
 
               <div className="site-content-header-wrapper">
                 {
diff --git a/src/components/siteSideMenu/styles.styl b/src/components/siteSideMenu/styles.styl
index 684298587074fc88d184a70ec91f872a94dd52ef..fcbab1fb80e8bc2a402b4fbcfc74522f9fe54877 100644
--- a/src/components/siteSideMenu/styles.styl
+++ b/src/components/siteSideMenu/styles.styl
@@ -88,7 +88,7 @@
 }
 
 .site-side-menu2-row .body a i {
-  margin auto
+  width 100%
 }
 
 .site-side-menu2-row .body a span {
diff --git a/src/components/sites/doExerciseSite/doExerciseSite.tsx b/src/components/sites/doExerciseSite/doExerciseSite.tsx
index 5208a0f6cd6bcafa7a4c5316b49ba26fa2342b8c..2446916d424ca8d31e505f9189e68117a319d001 100644
--- a/src/components/sites/doExerciseSite/doExerciseSite.tsx
+++ b/src/components/sites/doExerciseSite/doExerciseSite.tsx
@@ -272,7 +272,7 @@ const mapStateToProps = (rootState: RootState /*, props: MyProps*/) => {
 
     isOnGotFocusInterceptionOverlayDisplayed: rootState.doExerciseSiteState.isOnGotFocusInterceptionOverlayDisplayed,
 
-    isSiteHeaderBarDisplayed: rootState.siteHeaderBarState.isSiteHeaderBarDisplayedAndEnabled,
+    isSiteHeaderBarDisplayedAndEnabled: rootState.siteHeaderBarState.isSiteHeaderBarDisplayedAndEnabled,
     //if this.props.exercisePreview.isStillOpen === false we ignore this flag because we then edit the after solution
     lockSolutionsFlagAndIsStillOpen: rootState.doExerciseSiteState.lockSolutionsFlag
       && rootState.doExerciseSiteState.exercisePreviewFrontendTemp !== null && rootState.doExerciseSiteState.exercisePreviewFrontendTemp.isStillOpen,
diff --git a/src/components/sites/doExerciseSite/headerBarContent.tsx b/src/components/sites/doExerciseSite/headerBarContent.tsx
index b993eb942f25ce1e6894f45e9d9b311eb201a03a..3d06a24d21bb830e6e78d2976b2e477d202c3169 100644
--- a/src/components/sites/doExerciseSite/headerBarContent.tsx
+++ b/src/components/sites/doExerciseSite/headerBarContent.tsx
@@ -167,6 +167,9 @@ class HeaderBar extends React.Component<Props, any> {
 
   simulateSaveButtonPress = async (e: ExtendedKeyboardEvent | null) => {
 
+    if (this.props.isSomeDialogDisplayed) return
+
+    if (this.props.isSomeTestRunning) return
 
     if (this.props.exercisePreview !== null && this.props.exercisePreview.isPermanentlyLocked) {
       Logger.log('exercise is permanently locked, cannot save')
diff --git a/src/constants.ts b/src/constants.ts
index 342ad7a9bf0f8719ab5d05f305805da745374f8b..d5b696045e0fea217e973d90f0827ab7b26e18f8 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -13,7 +13,7 @@ import Logger from './helpers/logger'
  * y - breaking changes / new features
  * z - fixes, small changes
  */
-export const versionString = '2.4.9'
+export const versionString = '2.4.10'
 
 
 export const supportMail = 'yapex@informatik.uni-halle.de'
diff --git a/src/styles/common.styl b/src/styles/common.styl
index 895a1255892239493687f570dc9fee13f5e215ea..f6e330f5d31484ec8bd190497e20a06a382e7d8d 100644
--- a/src/styles/common.styl
+++ b/src/styles/common.styl
@@ -385,6 +385,10 @@ html, body {
   display none
 }
 
+.collapsed-i {
+  display none !important
+}
+
 .default-cursor {
   cursor auto !important
 }