diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4da4281e..18650c9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,8 @@ CHANGELOG for FlatCAM beta
 - GCode Editor - added a Beginner/Advanced toggle button
 - Geometry Editor - added a Beginner/Advanced toggle button
 - Geometry Editor - made sure that on right clicking in the Table the geometric element associated with the row under mouse cursor is selected
+- Geometry Editor - added the label Beginner/Advanced for uniformity within the app
+- minor string changes
 
 23.12.2020
 
diff --git a/appObjects/FlatCAMCNCJob.py b/appObjects/FlatCAMCNCJob.py
index 9bf630ba..0a17c96e 100644
--- a/appObjects/FlatCAMCNCJob.py
+++ b/appObjects/FlatCAMCNCJob.py
@@ -651,7 +651,7 @@ class CNCJobObject(FlatCAMObj, CNCjob):
 
         # Show/Hide Advanced Options
         if self.app.defaults["global_app_level"] == 'b':
-            self.ui.level.setText('<span style="color:green;"><b>%s</b></span>' % _("Basic"))
+            self.ui.level.setText('<span style="color:green;"><b>%s</b></span>' % _("Beginner"))
 
             self.ui.sal_btn.hide()
             self.ui.sal_btn.setChecked(False)
diff --git a/appObjects/FlatCAMDocument.py b/appObjects/FlatCAMDocument.py
index 215e4e18..0c809e30 100644
--- a/appObjects/FlatCAMDocument.py
+++ b/appObjects/FlatCAMDocument.py
@@ -67,7 +67,7 @@ class DocumentObject(FlatCAMObj):
 
         # Show/Hide Advanced Options
         if self.app.defaults["global_app_level"] == 'b':
-            self.ui.level.setText('<span style="color:green;"><b>%s</b></span>' % _("Basic"))
+            self.ui.level.setText('<span style="color:green;"><b>%s</b></span>' % _("Beginner"))
         else:
             self.ui.level.setText('<span style="color:red;"><b>%s</b></span>' % _("Advanced"))
 
diff --git a/appObjects/FlatCAMExcellon.py b/appObjects/FlatCAMExcellon.py
index 65816ef7..29d03f81 100644
--- a/appObjects/FlatCAMExcellon.py
+++ b/appObjects/FlatCAMExcellon.py
@@ -147,7 +147,7 @@ class ExcellonObject(FlatCAMObj, Excellon):
 
         # Show/Hide Advanced Options
         if self.app.defaults["global_app_level"] == 'b':
-            self.ui.level.setText('<span style="color:green;"><b>%s</b></span>' % _('Basic'))
+            self.ui.level.setText('<span style="color:green;"><b>%s</b></span>' % _('Beginner'))
 
             self.ui.tools_table.setColumnHidden(4, True)
             self.ui.tools_table.setColumnHidden(5, True)
diff --git a/appObjects/FlatCAMGeometry.py b/appObjects/FlatCAMGeometry.py
index 7ee4a24e..298f3597 100644
--- a/appObjects/FlatCAMGeometry.py
+++ b/appObjects/FlatCAMGeometry.py
@@ -699,6 +699,12 @@ class GeometryObject(FlatCAMObj, Geometry):
         #
         # self.launch_job.connect(self.mtool_gen_cncjob)
 
+        # Show/Hide Advanced Options
+        if self.app.defaults["global_app_level"] == 'b':
+            self.ui.level.setText('<span style="color:green;"><b>%s</b></span>' % _('Beginner'))
+        else:
+            self.ui.level.setText('<span style="color:red;"><b>%s</b></span>' % _('Advanced'))
+
     def on_properties(self, state):
         if state:
             self.ui.properties_frame.show()
@@ -3419,7 +3425,7 @@ class GeometryObject(FlatCAMObj, Geometry):
                     try:
                         new_options[option] = deepcopy(geo_obj.options[option])
                     except Exception as e:
-                        self.app.log.warning("Failed to copy option %s. Error: %s" % (str(option), str(e)))
+                        log.warning("Failed to copy option %s. Error: %s" % (str(option), str(e)))
 
             # Expand lists
             if type(geo_obj) is list:
@@ -3434,7 +3440,7 @@ class GeometryObject(FlatCAMObj, Geometry):
                 try:
                     new_solid_geometry += deepcopy(geo_obj.solid_geometry)
                 except Exception as e:
-                    self.app.log.debug("GeometryObject.merge() --> %s" % str(e))
+                    log.debug("GeometryObject.merge() --> %s" % str(e))
 
                 # find the tool_uid maximum value in the geo_final
                 try:
diff --git a/appObjects/FlatCAMGerber.py b/appObjects/FlatCAMGerber.py
index 441d66b6..4492d522 100644
--- a/appObjects/FlatCAMGerber.py
+++ b/appObjects/FlatCAMGerber.py
@@ -172,7 +172,7 @@ class GerberObject(FlatCAMObj, Gerber):
 
         # Show/Hide Advanced Options
         if self.app.defaults["global_app_level"] == 'b':
-            self.ui.level.setText('<span style="color:green;"><b>%s</b></span>' % _('Basic'))
+            self.ui.level.setText('<span style="color:green;"><b>%s</b></span>' % _('Beginner'))
 
             self.ui.apertures_table_label.hide()
             self.ui.aperture_table_visibility_cb.hide()
@@ -1560,7 +1560,7 @@ class GerberObject(FlatCAMObj, Gerber):
                         try:
                             grb_final.options[option] = grb.options[option]
                         except KeyError:
-                            self.app.log.warning("Failed to copy option.", option)
+                            log.warning("Failed to copy option.", option)
 
                 try:
                     for geos in grb.solid_geometry:
diff --git a/appObjects/FlatCAMScript.py b/appObjects/FlatCAMScript.py
index b4a5f32e..17f0eed4 100644
--- a/appObjects/FlatCAMScript.py
+++ b/appObjects/FlatCAMScript.py
@@ -77,7 +77,7 @@ class ScriptObject(FlatCAMObj):
 
         # Show/Hide Advanced Options
         if self.app.defaults["global_app_level"] == 'b':
-            self.ui.level.setText('<span style="color:green;"><b>%s</b></span>' % _("Basic"))
+            self.ui.level.setText('<span style="color:green;"><b>%s</b></span>' % _("Beginner"))
         else:
             self.ui.level.setText('<span style="color:red;"><b>%s</b></span>' % _("Advanced"))