diff --git a/CHANGELOG.md b/CHANGELOG.md
index ade01581..73683e82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,8 @@ CHANGELOG for FlatCAM beta
 - in NCC Tool fixed a bug when using Rest Machining; optimizations
 - in NCC Tool fixed a UI issue
 - updated the Turkish translation (by Mehmet Kaya)
+- small change in the CNCJob UI by replacing the AL checkbox with a checkable QButton
+- disabled the Autolevelling feature in CNCJob due of being not finished and missing also a not-yet-released package: Shapely v 1.8
 
 21.10.2020
 
diff --git a/appGUI/ObjectUI.py b/appGUI/ObjectUI.py
index 87722e8a..a2bd2318 100644
--- a/appGUI/ObjectUI.py
+++ b/appGUI/ObjectUI.py
@@ -2047,11 +2047,23 @@ class CNCObjectUI(ObjectUI):
         self.custom_box.addWidget(self.snippets_cb)
 
         # Autolevelling
-        self.sal_cb = FCCheckBox(_("Autolevelling"))
-        self.sal_cb.setToolTip(
+        self.sal_btn = FCButton('%s' % _("Autolevelling"), checkable=True)
+        # self.sal_btn.setIcon(QtGui.QIcon(self.app.resource_location + '/properties32.png'))
+        self.sal_btn.setToolTip(
             _("Enable the autolevelling feature.")
         )
-        self.custom_box.addWidget(self.sal_cb)
+        self.sal_btn.setStyleSheet("""
+                                  QPushButton
+                                  {
+                                      font-weight: bold;
+                                  }
+                                  """)
+        self.custom_box.addWidget(self.sal_btn)
+
+        separator_line = QtWidgets.QFrame()
+        separator_line.setFrameShape(QtWidgets.QFrame.HLine)
+        separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.custom_box.addWidget(separator_line)
 
         self.al_frame = QtWidgets.QFrame()
         self.al_frame.setContentsMargins(0, 0, 0, 0)
diff --git a/appObjects/FlatCAMCNCJob.py b/appObjects/FlatCAMCNCJob.py
index 2bfb3012..f73dd145 100644
--- a/appObjects/FlatCAMCNCJob.py
+++ b/appObjects/FlatCAMCNCJob.py
@@ -235,6 +235,11 @@ class CNCJobObject(FlatCAMObj, CNCjob):
     def build_ui(self):
         self.ui_disconnect()
 
+        # FIXME: until Shapely 1.8 comes this is disabled
+        self.ui.sal_btn.setChecked(False)
+        self.ui.sal_btn.setDisabled(True)
+        self.ui.sal_btn.setToolTip("DISABLED. Work in progress!")
+
         FlatCAMObj.build_ui(self)
         self.units = self.app.defaults['units'].upper()
 
@@ -249,7 +254,7 @@ class CNCJobObject(FlatCAMObj, CNCjob):
             self.ui.exc_cnc_tools_table.show()
             self.build_excellon_cnc_tools()
 
-        if self.ui.sal_cb.get_value():
+        if self.ui.sal_btn.isChecked():
             self.build_al_table()
 
         self.ui_connect()
@@ -584,7 +589,7 @@ class CNCJobObject(FlatCAMObj, CNCjob):
         self.calculations_finished.connect(self.update_area_chull)
 
         # autolevelling signals
-        self.ui.sal_cb.stateChanged.connect(self.on_toggle_autolevelling)
+        self.ui.sal_btn.toggled.connect(self.on_toggle_autolevelling)
         self.ui.al_mode_radio.activated_custom.connect(self.on_mode_radio)
         self.ui.al_method_radio.activated_custom.connect(self.on_method_radio)
         self.ui.al_controller_combo.currentIndexChanged.connect(self.on_controller_change)
@@ -637,19 +642,19 @@ class CNCJobObject(FlatCAMObj, CNCjob):
                 '<span style="color:green;"><b>Basic</b></span>'
             ))
 
-            self.ui.sal_cb.hide()
-            self.ui.sal_cb.set_value(False)
+            self.ui.sal_btn.hide()
+            self.ui.sal_btn.setChecked(False)
         else:
             self.ui.level.setText(_(
                 '<span style="color:red;"><b>Advanced</b></span>'
             ))
             if 'Roland' in self.pp_excellon_name or 'Roland' in self.pp_geometry_name or 'hpgl' in \
                     self.pp_geometry_name:
-                self.ui.sal_cb.hide()
-                self.ui.sal_cb.set_value(False)
+                self.ui.sal_btn.hide()
+                self.ui.sal_btn.setChecked(False)
             else:
-                self.ui.sal_cb.show()
-                self.ui.sal_cb.set_value(self.app.defaults["cncjob_al_status"])
+                self.ui.sal_btn.show()
+                self.ui.sal_btn.setChecked(self.app.defaults["cncjob_al_status"])
 
         preamble = self.append_snippet
         postamble = self.prepend_snippet