diff --git a/NEWS.md b/NEWS.md
index 8628c40b..60887512 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,7 @@
 Version 0.9.2 For Dev-C++ 7 Beta
  - fix: console program that needs input may crash
+ - fix: gutter of the disassembly code control in the cpu info dialog is grayed
+ - fix: problem set & problem views not correctly hidden when disabled in the general / problem set options 
 
 Version 0.9.1 For Dev-C++ 7 Beta
  - enhancement: code completion suggestion for "__func__" variable
diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.qm b/RedPandaIDE/RedPandaIDE_zh_CN.qm
index 5b733830..743bdf76 100644
Binary files a/RedPandaIDE/RedPandaIDE_zh_CN.qm and b/RedPandaIDE/RedPandaIDE_zh_CN.qm differ
diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.ts b/RedPandaIDE/RedPandaIDE_zh_CN.ts
index a500b37c..4088ca1d 100644
--- a/RedPandaIDE/RedPandaIDE_zh_CN.ts
+++ b/RedPandaIDE/RedPandaIDE_zh_CN.ts
@@ -1715,7 +1715,7 @@ Are you really want to continue?</source>
     <message>
         <location filename="settingsdialog/editorsyntaxcheckwidget.ui" line="49"/>
         <source>Check when count of lines changed</source>
-        <translation>在文件函数变化时检查</translation>
+        <translation>在文件行数或者光标所在行变化时检查</translation>
     </message>
 </context>
 <context>
@@ -7101,7 +7101,7 @@ Are you really want to continue?</source>
     <message>
         <location filename="settingsdialog/editorgeneralwidget.ui" line="234"/>
         <source>Highlight</source>
-        <translation type="unfinished">高亮显示</translation>
+        <translation>高亮显示</translation>
     </message>
     <message>
         <location filename="settingsdialog/editorgeneralwidget.ui" line="240"/>
diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp
index 1afc24fa..34410dd6 100644
--- a/RedPandaIDE/mainwindow.cpp
+++ b/RedPandaIDE/mainwindow.cpp
@@ -534,7 +534,7 @@ void MainWindow::applySettings()
             if (!mTcpServer.listen(QHostAddress::LocalHost,pSettings->executor().competivieCompanionPort())) {
 //                QMessageBox::critical(nullptr,
 //                                      tr("Listen failed"),
-//                                      tr("Can't listen to port %1 form Competitve Companion.").arg(10045)
+//                                      tr("Can't listen to port %1 form Competitive Companion.").arg(10045)
 //                                      + "<BR/>"
 //                                      +tr("You can turn off competitive companion support in the Problem Set options.")
 //                                      + "<BR/>"
@@ -574,7 +574,8 @@ void MainWindow::applyUISettings()
     ui->actionFiles->setChecked(settings.showFiles());
     showHideInfosTab(ui->tabFiles,settings.showFiles());
     ui->actionProblem_Set->setChecked(settings.showProblemSet());
-    showHideInfosTab(ui->tabProblemSet,settings.showProblemSet());
+    showHideInfosTab(ui->tabProblemSet,settings.showProblemSet()
+                     && pSettings->executor().enableProblemSet());
 
     ui->actionIssues->setChecked(settings.showIssues());
     showHideMessagesTab(ui->tabIssues,settings.showIssues());
@@ -589,7 +590,8 @@ void MainWindow::applyUISettings()
     ui->actionBookmark->setChecked(settings.showBookmark());
     showHideMessagesTab(ui->tabBookmark,settings.showBookmark());
     ui->actionProblem->setChecked(settings.showProblem());
-    showHideMessagesTab(ui->tabProblem,settings.showProblem());
+    showHideMessagesTab(ui->tabProblem,settings.showProblem()
+                        && pSettings->executor().enableProblemSet());
     //we can't show/hide left/bottom panels here, cause mainwindow layout is not calculated
 }
 
diff --git a/RedPandaIDE/qsynedit/SynEdit.cpp b/RedPandaIDE/qsynedit/SynEdit.cpp
index 155ae4f3..fafc06e4 100644
--- a/RedPandaIDE/qsynedit/SynEdit.cpp
+++ b/RedPandaIDE/qsynedit/SynEdit.cpp
@@ -119,7 +119,8 @@ SynEdit::SynEdit(QWidget *parent) : QAbstractScrollArea(parent)
     mBlockEnd = mBlockBegin;
     mOptions = eoAutoIndent
             | eoDragDropEditing | eoEnhanceEndKey | eoTabIndent |
-             eoGroupUndo | eoKeepCaretX | eoSelectWordByDblClick;
+             eoGroupUndo | eoKeepCaretX | eoSelectWordByDblClick
+            | eoHideShowScrollbars ;
 
     mScrollTimer = new QTimer(this);
     mScrollTimer->setInterval(100);
diff --git a/RedPandaIDE/widgets/cpudialog.cpp b/RedPandaIDE/widgets/cpudialog.cpp
index ccf1281c..75d8ff4d 100644
--- a/RedPandaIDE/widgets/cpudialog.cpp
+++ b/RedPandaIDE/widgets/cpudialog.cpp
@@ -19,7 +19,7 @@ CPUDialog::CPUDialog(QWidget *parent) :
 
     ui->txtCode->codeFolding().indentGuides = false;
     ui->txtCode->codeFolding().fillIndents = false;
-    ui->txtCode->setRightEdge(0);
+    ui->txtCode->setGutterWidth(0);
     ui->txtCode->setUseCodeFolding(false);
     highlighterManager.applyColorScheme(ui->txtCode->highlighter(),
                                         pSettings->editor().colorScheme());