diff --git a/TODO b/TODO
index 8e0f224d45a42557f002b3b4d341e74668089cbb..373d3b0e5ea19f4696e1c2187202ce25d9fec86e 100644
--- a/TODO
+++ b/TODO
@@ -1,12 +1,12 @@
-888b      88                                    88                     
-8888b     88                             ,d     88                     
-88 `8b    88                             88     88                     
-88  `8b   88   ,adPPYba,    ,adPPYba,  MM88MMM  88   ,d8   ,adPPYYba,  
-88   `8b  88  a8"     "8a  a8"     "8a   88     88 ,a8"    ""     `Y8  
-88    `8b 88  8b       d8  8b       d8   88     8888[      ,adPPPPP88  
-88     `8888  "8a,   ,a8"  "8a,   ,a8"   88,    88`"Yba,   88,    ,88  
-88      `888   `"YbbdP"'    `"YbbdP"'    "Y888  88   `Y8a  `"8bbdP"Y8  
-                                                                       
+888b      88                                    88
+8888b     88                             ,d     88
+88 `8b    88                             88     88
+88  `8b   88   ,adPPYba,    ,adPPYba,  MM88MMM  88   ,d8   ,adPPYYba,
+88   `8b  88  a8"     "8a  a8"     "8a   88     88 ,a8"    ""     `Y8
+88    `8b 88  8b       d8  8b       d8   88     8888[      ,adPPPPP88
+88     `8888  "8a,   ,a8"  "8a,   ,a8"   88,    88`"Yba,   88,    ,88
+88      `888   `"YbbdP"'    `"YbbdP"'    "Y888  88   `Y8a  `"8bbdP"Y8
+
 ============================================================================
 ================              TODO LIST               ======================
 ============================================================================
@@ -17,7 +17,7 @@ TRANSLATION CONTEXT CHANGES
   TaboutNootka -> AuthorsPage
   TscoreSettings -> ScorePage, KeySufixEdit,  (rearrange ScorePage)
   TradioClef - Tclef (rearrange Tclef)
-  TscoreActions & TmelMan - MainScore
+  TscoreActions & TmelMan - TmainScoreObject
   TtoolBar - MainWindow
   TtoolBar - exam actions are created in TexamExecutor
   accidssettings -> AccidsPage (but remove line breaks from descriptions)
@@ -29,13 +29,12 @@ TRANSLATION CONTEXT CHANGES
 ============================================================================
 
 small glitches:
+ - clef is not approved when settings were accepted
  - sometimes setting a note doesn't scale tie - probably due to note width is not refreshed
+ - meter can be too close to key signature - probably related with clef change
 
 
 ============================================================================
-- TexamExecutor has many, many un-wrapped strings, many ""
-- Use int and enumerations between plugins and main window instead of text messages (level plugin to do)
-
 To consideration:
 - additional settings options:
     - disable screen locking (TRUE by default)
@@ -58,12 +57,9 @@ To consideration:
 - certificates would have some additional data about melodies
 - bring back isVoice() audio param - average pitch of all chunks or min duration will depend on it
 
-- divide TexamExecutor class !!!!!
-
 - dialog to configure generated melody and its rhythms
 - rhythms in level and exercise/exam
-- Class that manages recent exams menu list and has colored item 'recent opened exams',
-    use recent exams list for analyzer the same as start exam dialog has (common class or method)
+
 - managing melodies in levels, adding set of melodies to the level
 - settings for keyboard shortcuts
 - sophisticated and configurable algorithm to generate random melodies
diff --git a/src/qml/shared/MenuButton.qml b/src/qml/shared/MenuButton.qml
index 05a2c32f54656a19f045a579e60d035cde34961f..431be3a7dc0bf682eae3cdb648ef5bdc77bdd119 100644
--- a/src/qml/shared/MenuButton.qml
+++ b/src/qml/shared/MenuButton.qml
@@ -50,7 +50,7 @@ Rectangle {
     TcheckBox {
       anchors {verticalCenter: parent.verticalCenter}
       checked: menuButton.action.checked
-      onClicked: menuButton.clicked()
+      onClicked: buttonClicked()
       x: (Noo.fontSize() * 3.5 - width) / 2
     }
   }
@@ -58,9 +58,10 @@ Rectangle {
   Component {
     id: shortComp
     Text {
-      anchors {verticalCenter: parent.verticalCenter}
+      anchors.verticalCenter: parent.verticalCenter
       text: "(" + action.key() + ")"
-      x: menuButton.width - width - Noo.fontSize()
+      font.pixelSize: Noo.fontSize() * 0.8
+      x: menuButton.width - width - Noo.fontSize() / 2
     }
   }
 
@@ -73,13 +74,15 @@ Rectangle {
     id: ma
     anchors.fill: parent
     hoverEnabled: true
-    onClicked: {
-      menuButton.clicked()
-      if (action) {
-        if (action.checkable)
-          action.checked = !action.checked
-        action.trigger()
-      }
+    onClicked: buttonClicked()
+  }
+
+  function buttonClicked() {
+    menuButton.clicked()
+    if (action) {
+      if (action.checkable)
+        action.checked = !action.checked
+      action.trigger()
     }
   }
 }