diff --git a/src/View/BoundaryCondition/Edit/Plot.py b/src/View/BoundaryCondition/Edit/Plot.py
index a7815e609662172368b5e2412b8dae14b749c78a..e5e80c1e329322ca059d505beec1f47bda383275 100644
--- a/src/View/BoundaryCondition/Edit/Plot.py
+++ b/src/View/BoundaryCondition/Edit/Plot.py
@@ -21,7 +21,7 @@ import logging
 from datetime import datetime
 
 from tools import timer, trace
-from View.Plot.APlot import APlot
+from View.Tools.PamhyrPlot import PamhyrPlot
 
 from PyQt5.QtCore import (
     QCoreApplication
@@ -33,16 +33,18 @@ _translate = QCoreApplication.translate
 
 logger = logging.getLogger()
 
-class Plot(APlot):
-    def __init__(self, canvas=None, data=None,
-                 mode = "time", toolbar=None):
+class Plot(PamhyrPlot):
+    def __init__(self, mode = "time", data=None,
+                 trad=None, canvas=None, toolbar=None,
+                 parent=None):
         super(Plot, self).__init__(
-            canvas=canvas,
-            data=data,
-            toolbar=toolbar
+            canvas = canvas,
+            trad = trad,
+            data = data,
+            toolbar = toolbar,
+            parent = parent
         )
 
-        self._trad = BCETranslate()
         self._table_headers = self._trad.get_dict("table_headers")
         self._mode = mode
 
diff --git a/src/View/BoundaryCondition/Edit/Window.py b/src/View/BoundaryCondition/Edit/Window.py
index 13d277e6d524504b5e4404850271c12c0be199b9..5661d6bc63c7226c02287273bb263a98dfb7228a 100644
--- a/src/View/BoundaryCondition/Edit/Window.py
+++ b/src/View/BoundaryCondition/Edit/Window.py
@@ -41,8 +41,8 @@ from PyQt5.QtWidgets import (
     QHeaderView, QDoubleSpinBox, QVBoxLayout,
 )
 
-from View.Plot.MplCanvas import MplCanvas
-from View.Plot.PamhyrToolbar import PamhyrPlotToolbar
+from View.Tools.Plot.PamhyrCanvas import MplCanvas
+from View.Tools.Plot.PamhyrToolbar import PamhyrPlotToolbar
 
 from View.BoundaryCondition.Edit.translate import BCETranslate
 from View.BoundaryCondition.Edit.UndoCommand import SetMetaDataCommand
@@ -122,8 +122,6 @@ class EditBoundaryConditionWindow(PamhyrWindow):
             parent = parent
         )
 
-        self.ui.setWindowTitle(self._title)
-
         self.setup_table()
         self.setup_plot()
         self.setup_data()
@@ -183,6 +181,7 @@ class EditBoundaryConditionWindow(PamhyrWindow):
             canvas = self.canvas,
             data = self._data,
             mode = self._study.time_system,
+            trad = self._trad,
             toolbar = self.toolbar,
         )
         self.plot.draw()
diff --git a/src/View/MainWindow.py b/src/View/MainWindow.py
index 8162807e377723ad1bafeb207883f18644eb92b1..266dc321f92b3098fa2e42893107500eaf4c3f99 100644
--- a/src/View/MainWindow.py
+++ b/src/View/MainWindow.py
@@ -45,7 +45,7 @@ from View.Study.Window import NewStudyWindow
 from View.About.Window import AboutWindow
 from View.Network.Window import NetworkWindow
 from View.Geometry.Window import GeometryWindow
-# from View.BoundaryCondition.Window import BoundaryConditionWindow
+from View.BoundaryCondition.Window import BoundaryConditionWindow
 # from View.LateralContribution.Window import LateralContributionWindow
 # from View.InitialConditions.Window import InitialConditionsWindow
 # from View.Stricklers.Window import StricklersWindow