diff --git a/FlatCAMApp.py b/FlatCAMApp.py
index 1a228bf9..a0c2bd30 100644
--- a/FlatCAMApp.py
+++ b/FlatCAMApp.py
@@ -3448,8 +3448,6 @@ class App(QtCore.QObject):
                         # restore GUI to the Selected TAB
                         # Remove anything else in the GUI
                         self.ui.tool_scroll_area.takeWidget()
-                        # Switch notebook to Selected page
-                        self.ui.notebook.setCurrentWidget(self.ui.selected_tab)
 
                     elif isinstance(edited_obj, FlatCAMGerber):
                         obj_type = "Gerber"
@@ -3473,14 +3471,12 @@ class App(QtCore.QObject):
                         # restore GUI to the Selected TAB
                         # Remove anything else in the GUI
                         self.ui.selected_scroll_area.takeWidget()
-                        # Switch notebook to Selected page
-                        self.ui.notebook.setCurrentWidget(self.ui.selected_tab)
 
                     elif isinstance(edited_obj, FlatCAMExcellon):
                         obj_type = "Excellon"
                         if cleanup is None:
                             self.exc_editor.update_fcexcellon(edited_obj)
-                            self.exc_editor.update_options(edited_obj)
+                            # self.exc_editor.update_options(edited_obj)
 
                         self.exc_editor.deactivate()
 
@@ -3493,8 +3489,6 @@ class App(QtCore.QObject):
                         # restore GUI to the Selected TAB
                         # Remove anything else in the GUI
                         self.ui.tool_scroll_area.takeWidget()
-                        # Switch notebook to Selected page
-                        self.ui.notebook.setCurrentWidget(self.ui.selected_tab)
 
                     else:
                         self.inform.emit('[WARNING_NOTCL] %s' %
@@ -3519,11 +3513,13 @@ class App(QtCore.QObject):
                         self.inform.emit('[WARNING_NOTCL] %s' %
                                          _("Select a Gerber, Geometry or Excellon Object to update."))
                         return
-                    edited_obj.set_ui(edited_obj.ui_type(decimals=self.decimals))
-                    edited_obj.build_ui()
-                    self.ui.notebook.setCurrentWidget(self.ui.selected_tab)
                 elif response == bt_cancel:
                     return
+
+                edited_obj.set_ui(edited_obj.ui_type(decimals=self.decimals))
+                edited_obj.build_ui()
+                # Switch notebook to Selected page
+                self.ui.notebook.setCurrentWidget(self.ui.selected_tab)
             else:
                 if isinstance(edited_obj, FlatCAMGeometry):
                     self.geo_editor.deactivate()
diff --git a/README.md b/README.md
index e3dfaf54..fc0ebf77 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,10 @@ CAD program, and create G-Code for Isolation routing.
 
 =================================================
 
+28.01.2020
+
+- some changes in Excellon Editor
+
 27.01.2020
 
 - in Geometry Editor made sure that on final save, for MultiLineString geometry all the connected lines are merged into one LineString to minimize the number of vertical movements in GCode
diff --git a/flatcamTools/ToolPunchGerber.py b/flatcamTools/ToolPunchGerber.py
index 16aeabb8..807bbe0c 100644
--- a/flatcamTools/ToolPunchGerber.py
+++ b/flatcamTools/ToolPunchGerber.py
@@ -15,17 +15,6 @@ from copy import deepcopy
 import logging
 from shapely.geometry import Polygon, MultiPolygon, Point
 
-from reportlab.graphics import renderPDF
-from reportlab.pdfgen import canvas
-from reportlab.graphics import renderPM
-from reportlab.lib.units import inch, mm
-from reportlab.lib.pagesizes import landscape, portrait
-
-from svglib.svglib import svg2rlg
-from xml.dom.minidom import parseString as parse_xml_string
-from lxml import etree as ET
-from io import StringIO
-
 import gettext
 import FlatCAMTranslation as fcTranslate
 import builtins