diff --git a/gns3/dialogs/node_properties_dialog.py b/gns3/dialogs/node_properties_dialog.py
index 26078117..4ea15a50 100644
--- a/gns3/dialogs/node_properties_dialog.py
+++ b/gns3/dialogs/node_properties_dialog.py
@@ -137,9 +137,17 @@ class NodePropertiesDialog(QtWidgets.QDialog, Ui_NodePropertiesDialog):
         if page != self.uiEmptyPageWidget:
             self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Apply).setEnabled(True)
             self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Reset).setEnabled(True)
+            self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Help).setEnabled(True)
         else:
             self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Apply).setEnabled(False)
             self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Reset).setEnabled(False)
+            self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Help).setEnabled(False)
+
+        # hide the contextual help button if there is no help text
+        if page.whatsThis():
+            self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Help).show()
+        else:
+            self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Help).hide()
 
     def on_uiButtonBox_clicked(self, button):
         """
@@ -153,6 +161,8 @@ class NodePropertiesDialog(QtWidgets.QDialog, Ui_NodePropertiesDialog):
                 self.applySettings()
             elif button == self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Reset):
                 self.resetSettings()
+            elif button == self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Help):
+                self.showHelp()
             elif button == self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Cancel):
                 QtWidgets.QDialog.reject(self)
             else:
@@ -215,6 +225,14 @@ class NodePropertiesDialog(QtWidgets.QDialog, Ui_NodePropertiesDialog):
                 child = item.child(index)
                 child.setSettings(child.node().settings().copy())
 
+    def showHelp(self):
+        """
+        Show contextual help for the current page.
+        """
+
+        page = self.uiConfigStackedWidget.currentWidget()
+        if page != self.uiEmptyPageWidget and page.whatsThis():
+            QtWidgets.QMessageBox.information(self, "{} help".format(page.windowTitle()), page.whatsThis().strip())
 
 class ConfigurationPageItem(QtWidgets.QTreeWidgetItem):
 
diff --git a/gns3/graphics_view.py b/gns3/graphics_view.py
index 7737ad5f..166f4cb5 100644
--- a/gns3/graphics_view.py
+++ b/gns3/graphics_view.py
@@ -550,7 +550,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
         if not self._adding_link:
             if isinstance(item, NodeItem) and item.node().initialized():
                 item.setSelected(True)
-                if item.node().status() == Node.stopped:
+                if item.node().status() == Node.stopped or item.node().isAlwaysOn():
                     self.configureSlot()
                     return
                 else:
diff --git a/gns3/modules/builtin/pages/cloud_configuration_page.py b/gns3/modules/builtin/pages/cloud_configuration_page.py
index d4a49595..077c645f 100644
--- a/gns3/modules/builtin/pages/cloud_configuration_page.py
+++ b/gns3/modules/builtin/pages/cloud_configuration_page.py
@@ -19,13 +19,12 @@
 Configuration page for clouds.
 """
 
-from gns3.qt import QtGui, QtCore, QtWidgets
+from gns3.qt import QtCore, QtWidgets
 from gns3.dialogs.symbol_selection_dialog import SymbolSelectionDialog
 from gns3.controller import Controller
 from gns3.node import Node
 
 from ..ui.cloud_configuration_page_ui import Ui_cloudConfigPageWidget
-from ..cloud import Cloud
 
 
 class CloudConfigurationPage(QtWidgets.QWidget, Ui_cloudConfigPageWidget):
@@ -48,6 +47,7 @@ class CloudConfigurationPage(QtWidgets.QWidget, Ui_cloudConfigPageWidget):
 
         # connect Ethernet slots
         self.uiEthernetListWidget.itemSelectionChanged.connect(self._EthernetChangedSlot)
+        self.uiEthernetWarningPushButton.clicked.connect(self._EthernetWarningSlot)
         self.uiAddEthernetPushButton.clicked.connect(self._EthernetAddSlot)
         self.uiAddAllEthernetPushButton.clicked.connect(self._EthernetAddAllSlot)
         self.uiDeleteEthernetPushButton.clicked.connect(self._EthernetDeleteSlot)
@@ -79,6 +79,13 @@ class CloudConfigurationPage(QtWidgets.QWidget, Ui_cloudConfigPageWidget):
         else:
             self.uiDeleteEthernetPushButton.setEnabled(False)
 
+    def _EthernetWarningSlot(self):
+        """
+        Shows a warning about Wifi Ethernet interfaces.
+        """
+
+        QtWidgets.QMessageBox.warning(self, "Ethernet interfaces", "Wifi interfaces may not work properly. It is recommended to use wired Ethernet or Loopback interfaces only.")
+
     def _EthernetAddSlot(self, interface=None):
         """
         Adds a new Ethernet interface.
diff --git a/gns3/modules/builtin/pages/ethernet_hub_configuration_page.py b/gns3/modules/builtin/pages/ethernet_hub_configuration_page.py
index c92a62d2..e02dbacc 100644
--- a/gns3/modules/builtin/pages/ethernet_hub_configuration_page.py
+++ b/gns3/modules/builtin/pages/ethernet_hub_configuration_page.py
@@ -19,7 +19,7 @@
 Configuration page for Ethernet hubs.
 """
 
-from gns3.qt import QtGui, QtWidgets
+from gns3.qt import QtWidgets
 from gns3.dialogs.node_properties_dialog import ConfigurationError
 from gns3.dialogs.symbol_selection_dialog import SymbolSelectionDialog
 from gns3.node import Node
diff --git a/gns3/modules/builtin/pages/ethernet_switch_configuration_page.py b/gns3/modules/builtin/pages/ethernet_switch_configuration_page.py
index 9a7c3ed3..404b6fd9 100644
--- a/gns3/modules/builtin/pages/ethernet_switch_configuration_page.py
+++ b/gns3/modules/builtin/pages/ethernet_switch_configuration_page.py
@@ -19,7 +19,7 @@
 Configuration page for Ethernet switches.
 """
 
-from gns3.qt import QtGui, QtCore, QtWidgets
+from gns3.qt import QtCore, QtWidgets
 from gns3.dialogs.symbol_selection_dialog import SymbolSelectionDialog
 from gns3.node import Node
 
diff --git a/gns3/modules/builtin/ui/atm_switch_configuration_page.ui b/gns3/modules/builtin/ui/atm_switch_configuration_page.ui
index 89b4216f..56fa8619 100755
--- a/gns3/modules/builtin/ui/atm_switch_configuration_page.ui
+++ b/gns3/modules/builtin/ui/atm_switch_configuration_page.ui
@@ -6,13 +6,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>459</width>
-    <height>430</height>
+    <width>540</width>
+    <height>553</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>ATM Switch</string>
   </property>
+  <property name="whatsThis">
+   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is a simple ATM switch. Only IOS c7200 routers with at least a configured PA-A1 adapter can connect to it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+  </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <item row="0" column="0" colspan="3">
     <widget class="QGroupBox" name="uiGeneralGroupBox">
diff --git a/gns3/modules/builtin/ui/atm_switch_configuration_page_ui.py b/gns3/modules/builtin/ui/atm_switch_configuration_page_ui.py
index 97d87cf7..2a9fe7d9 100644
--- a/gns3/modules/builtin/ui/atm_switch_configuration_page_ui.py
+++ b/gns3/modules/builtin/ui/atm_switch_configuration_page_ui.py
@@ -1,16 +1,14 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file '/Users/noplay/code/gns3/gns3-gui/gns3/modules/builtin/ui/atm_switch_configuration_page.ui'
+# Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/modules/builtin/ui/atm_switch_configuration_page.ui'
 #
-# Created by: PyQt5 UI code generator 5.6
+# Created by: PyQt5 UI code generator 5.5.1
 #
 # WARNING! All changes made in this file will be lost!
 
 from PyQt5 import QtCore, QtGui, QtWidgets
 
-
 class Ui_atmSwitchConfigPageWidget(object):
-
     def setupUi(self, atmSwitchConfigPageWidget):
         atmSwitchConfigPageWidget.setObjectName("atmSwitchConfigPageWidget")
         atmSwitchConfigPageWidget.resize(459, 430)
@@ -170,6 +168,7 @@ class Ui_atmSwitchConfigPageWidget(object):
     def retranslateUi(self, atmSwitchConfigPageWidget):
         _translate = QtCore.QCoreApplication.translate
         atmSwitchConfigPageWidget.setWindowTitle(_translate("atmSwitchConfigPageWidget", "ATM Switch"))
+        atmSwitchConfigPageWidget.setWhatsThis(_translate("atmSwitchConfigPageWidget", "<html><head/><body><p>This is a simple ATM switch. Only IOS c7200 routers with at least a configured PA-A1 adapter can connect to it.</p></body></html>"))
         self.uiGeneralGroupBox.setTitle(_translate("atmSwitchConfigPageWidget", "General"))
         self.uiNameLabel.setText(_translate("atmSwitchConfigPageWidget", "Name:"))
         self.uiVPICheckBox.setText(_translate("atmSwitchConfigPageWidget", "Use VPI only (VP tunnel)"))
@@ -186,3 +185,4 @@ class Ui_atmSwitchConfigPageWidget(object):
         self.uiDestinationPortLabel.setText(_translate("atmSwitchConfigPageWidget", "Port:"))
         self.uiDestinationVPILabel.setText(_translate("atmSwitchConfigPageWidget", "VPI:"))
         self.uiDestinationVCILabel.setText(_translate("atmSwitchConfigPageWidget", "VCI:"))
+
diff --git a/gns3/modules/builtin/ui/cloud_configuration_page.ui b/gns3/modules/builtin/ui/cloud_configuration_page.ui
index 10edeb23..169972d0 100755
--- a/gns3/modules/builtin/ui/cloud_configuration_page.ui
+++ b/gns3/modules/builtin/ui/cloud_configuration_page.ui
@@ -6,13 +6,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>758</width>
-    <height>299</height>
+    <width>821</width>
+    <height>363</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Cloud configuration</string>
   </property>
+  <property name="whatsThis">
+   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A cloud node allows you to connect your project to the &amp;quot;real world&amp;quot; (a network or host) using either an Ethernet interface, a TAP interface (Linux only) or even an UDP tunnel. &lt;span style=&quot; font-weight:600;&quot;&gt;Please be aware that Wifi interfaces may not work properly.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QTabWidget" name="uiTabWidget">
@@ -40,21 +43,21 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="1">
+       <item row="0" column="2">
         <widget class="QPushButton" name="uiAddEthernetPushButton">
          <property name="text">
           <string>&amp;Add</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="2">
+       <item row="0" column="3">
         <widget class="QPushButton" name="uiAddAllEthernetPushButton">
          <property name="text">
           <string>&amp;Add all</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="3">
+       <item row="0" column="4">
         <widget class="QPushButton" name="uiDeleteEthernetPushButton">
          <property name="enabled">
           <bool>false</bool>
@@ -64,7 +67,7 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="0" colspan="4">
+       <item row="1" column="0" colspan="5">
         <widget class="QListWidget" name="uiEthernetListWidget">
          <property name="selectionMode">
           <enum>QAbstractItemView::ExtendedSelection</enum>
@@ -74,7 +77,17 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="0">
+       <item row="0" column="1">
+        <widget class="QPushButton" name="uiEthernetWarningPushButton">
+         <property name="text">
+          <string/>
+         </property>
+         <property name="icon">
+          <iconset theme="dialog-warning"/>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" colspan="2">
         <widget class="QCheckBox" name="uiShowSpecialInterfacesCheckBox">
          <property name="text">
           <string>&amp;Show special Ethernet interfaces</string>
@@ -88,6 +101,7 @@
       <zorder>uiDeleteEthernetPushButton</zorder>
       <zorder>uiAddAllEthernetPushButton</zorder>
       <zorder>uiShowSpecialInterfacesCheckBox</zorder>
+      <zorder>uiEthernetWarningPushButton</zorder>
      </widget>
      <widget class="QWidget" name="TAPTab">
       <attribute name="title">
diff --git a/gns3/modules/builtin/ui/cloud_configuration_page_ui.py b/gns3/modules/builtin/ui/cloud_configuration_page_ui.py
index aeac48be..712e0ee1 100644
--- a/gns3/modules/builtin/ui/cloud_configuration_page_ui.py
+++ b/gns3/modules/builtin/ui/cloud_configuration_page_ui.py
@@ -2,8 +2,7 @@
 
 # Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/modules/builtin/ui/cloud_configuration_page.ui'
 #
-# Created: Fri Jun 10 16:26:54 2016
-#      by: PyQt5 UI code generator 5.2.1
+# Created by: PyQt5 UI code generator 5.5.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -33,21 +32,34 @@ class Ui_cloudConfigPageWidget(object):
         self.gridLayout_3.addWidget(self.uiEthernetComboBox, 0, 0, 1, 1)
         self.uiAddEthernetPushButton = QtWidgets.QPushButton(self.EthernetTab)
         self.uiAddEthernetPushButton.setObjectName("uiAddEthernetPushButton")
-        self.gridLayout_3.addWidget(self.uiAddEthernetPushButton, 0, 1, 1, 1)
+        self.gridLayout_3.addWidget(self.uiAddEthernetPushButton, 0, 2, 1, 1)
         self.uiAddAllEthernetPushButton = QtWidgets.QPushButton(self.EthernetTab)
         self.uiAddAllEthernetPushButton.setObjectName("uiAddAllEthernetPushButton")
-        self.gridLayout_3.addWidget(self.uiAddAllEthernetPushButton, 0, 2, 1, 1)
+        self.gridLayout_3.addWidget(self.uiAddAllEthernetPushButton, 0, 3, 1, 1)
         self.uiDeleteEthernetPushButton = QtWidgets.QPushButton(self.EthernetTab)
         self.uiDeleteEthernetPushButton.setEnabled(False)
         self.uiDeleteEthernetPushButton.setObjectName("uiDeleteEthernetPushButton")
-        self.gridLayout_3.addWidget(self.uiDeleteEthernetPushButton, 0, 3, 1, 1)
+        self.gridLayout_3.addWidget(self.uiDeleteEthernetPushButton, 0, 4, 1, 1)
         self.uiEthernetListWidget = QtWidgets.QListWidget(self.EthernetTab)
         self.uiEthernetListWidget.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection)
         self.uiEthernetListWidget.setObjectName("uiEthernetListWidget")
-        self.gridLayout_3.addWidget(self.uiEthernetListWidget, 1, 0, 1, 4)
+        self.gridLayout_3.addWidget(self.uiEthernetListWidget, 1, 0, 1, 5)
+        self.uiEthernetWarningPushButton = QtWidgets.QPushButton(self.EthernetTab)
+        self.uiEthernetWarningPushButton.setText("")
+        icon = QtGui.QIcon.fromTheme("dialog-warning")
+        self.uiEthernetWarningPushButton.setIcon(icon)
+        self.uiEthernetWarningPushButton.setObjectName("uiEthernetWarningPushButton")
+        self.gridLayout_3.addWidget(self.uiEthernetWarningPushButton, 0, 1, 1, 1)
         self.uiShowSpecialInterfacesCheckBox = QtWidgets.QCheckBox(self.EthernetTab)
         self.uiShowSpecialInterfacesCheckBox.setObjectName("uiShowSpecialInterfacesCheckBox")
-        self.gridLayout_3.addWidget(self.uiShowSpecialInterfacesCheckBox, 2, 0, 1, 1)
+        self.gridLayout_3.addWidget(self.uiShowSpecialInterfacesCheckBox, 2, 0, 1, 2)
+        self.uiEthernetListWidget.raise_()
+        self.uiEthernetComboBox.raise_()
+        self.uiAddEthernetPushButton.raise_()
+        self.uiDeleteEthernetPushButton.raise_()
+        self.uiAddAllEthernetPushButton.raise_()
+        self.uiShowSpecialInterfacesCheckBox.raise_()
+        self.uiEthernetWarningPushButton.raise_()
         self.uiTabWidget.addTab(self.EthernetTab, "")
         self.TAPTab = QtWidgets.QWidget()
         self.TAPTab.setObjectName("TAPTab")
@@ -225,6 +237,7 @@ class Ui_cloudConfigPageWidget(object):
     def retranslateUi(self, cloudConfigPageWidget):
         _translate = QtCore.QCoreApplication.translate
         cloudConfigPageWidget.setWindowTitle(_translate("cloudConfigPageWidget", "Cloud configuration"))
+        cloudConfigPageWidget.setWhatsThis(_translate("cloudConfigPageWidget", "<html><head/><body><p>A cloud node allows you to connect your project to the &quot;real world&quot; (a network or host) using either an Ethernet interface, a TAP interface (Linux only) or even an UDP tunnel. <span style=\" font-weight:600;\">Please be aware that Wifi interfaces may not work properly.</span></p></body></html>"))
         self.uiAddEthernetPushButton.setText(_translate("cloudConfigPageWidget", "&Add"))
         self.uiAddAllEthernetPushButton.setText(_translate("cloudConfigPageWidget", "&Add all"))
         self.uiDeleteEthernetPushButton.setText(_translate("cloudConfigPageWidget", "&Delete"))
diff --git a/gns3/modules/builtin/ui/frame_relay_switch_configuration_page.ui b/gns3/modules/builtin/ui/frame_relay_switch_configuration_page.ui
index 19ef3394..94da8157 100755
--- a/gns3/modules/builtin/ui/frame_relay_switch_configuration_page.ui
+++ b/gns3/modules/builtin/ui/frame_relay_switch_configuration_page.ui
@@ -7,12 +7,15 @@
     <x>0</x>
     <y>0</y>
     <width>499</width>
-    <height>405</height>
+    <height>414</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Frame Relay Switch</string>
   </property>
+  <property name="whatsThis">
+   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is a simple Frame Relay switch. Only serial links can be connected to it. &lt;span style=&quot; font-weight:600;&quot;&gt;Note that only the Frame-Relay LMI AINSI type is supported.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+  </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <item row="0" column="0" colspan="2">
     <widget class="QGroupBox" name="uiGeneralGroupBox">
diff --git a/gns3/modules/builtin/ui/frame_relay_switch_configuration_page_ui.py b/gns3/modules/builtin/ui/frame_relay_switch_configuration_page_ui.py
index 0f2fc4c6..3db28a8a 100644
--- a/gns3/modules/builtin/ui/frame_relay_switch_configuration_page_ui.py
+++ b/gns3/modules/builtin/ui/frame_relay_switch_configuration_page_ui.py
@@ -1,19 +1,17 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file '/Users/noplay/code/gns3/gns3-gui/gns3/modules/dynamips/ui/frame_relay_switch_configuration_page.ui'
+# Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/modules/builtin/ui/frame_relay_switch_configuration_page.ui'
 #
-# Created by: PyQt5 UI code generator 5.4.2
+# Created by: PyQt5 UI code generator 5.5.1
 #
 # WARNING! All changes made in this file will be lost!
 
 from PyQt5 import QtCore, QtGui, QtWidgets
 
-
 class Ui_frameRelaySwitchConfigPageWidget(object):
-
     def setupUi(self, frameRelaySwitchConfigPageWidget):
         frameRelaySwitchConfigPageWidget.setObjectName("frameRelaySwitchConfigPageWidget")
-        frameRelaySwitchConfigPageWidget.resize(499, 405)
+        frameRelaySwitchConfigPageWidget.resize(499, 414)
         self.gridLayout_2 = QtWidgets.QGridLayout(frameRelaySwitchConfigPageWidget)
         self.gridLayout_2.setObjectName("gridLayout_2")
         self.uiGeneralGroupBox = QtWidgets.QGroupBox(frameRelaySwitchConfigPageWidget)
@@ -136,6 +134,7 @@ class Ui_frameRelaySwitchConfigPageWidget(object):
     def retranslateUi(self, frameRelaySwitchConfigPageWidget):
         _translate = QtCore.QCoreApplication.translate
         frameRelaySwitchConfigPageWidget.setWindowTitle(_translate("frameRelaySwitchConfigPageWidget", "Frame Relay Switch"))
+        frameRelaySwitchConfigPageWidget.setWhatsThis(_translate("frameRelaySwitchConfigPageWidget", "<html><head/><body><p>This is a simple Frame Relay switch. Only serial links can be connected to it. <span style=\" font-weight:600;\">Note that only the Frame-Relay LMI AINSI type is supported.</span></p></body></html>"))
         self.uiGeneralGroupBox.setTitle(_translate("frameRelaySwitchConfigPageWidget", "General"))
         self.uiNameLabel.setText(_translate("frameRelaySwitchConfigPageWidget", "Name:"))
         self.uiFrameRelayMappingGroupBox.setTitle(_translate("frameRelaySwitchConfigPageWidget", "Mapping"))
@@ -149,3 +148,4 @@ class Ui_frameRelaySwitchConfigPageWidget(object):
         self.uiDestinationDLCILabel.setText(_translate("frameRelaySwitchConfigPageWidget", "DLCI:"))
         self.uiAddPushButton.setText(_translate("frameRelaySwitchConfigPageWidget", "&Add"))
         self.uiDeletePushButton.setText(_translate("frameRelaySwitchConfigPageWidget", "&Delete"))
+
diff --git a/gns3/modules/docker/pages/docker_vm_configuration_page.py b/gns3/modules/docker/pages/docker_vm_configuration_page.py
index abd68274..7a82b6b3 100644
--- a/gns3/modules/docker/pages/docker_vm_configuration_page.py
+++ b/gns3/modules/docker/pages/docker_vm_configuration_page.py
@@ -19,7 +19,7 @@
 Configuration page for Docker images.
 """
 
-from gns3.qt import QtWidgets, QtGui
+from gns3.qt import QtWidgets
 
 from ..ui.docker_vm_configuration_page_ui import Ui_dockerVMConfigPageWidget
 from ....dialogs.file_editor_dialog import FileEditorDialog
@@ -27,9 +27,10 @@ from ....dialogs.node_properties_dialog import ConfigurationError
 from ....dialogs.symbol_selection_dialog import SymbolSelectionDialog
 
 
-class DockerVMConfigurationPage(
-        QtWidgets.QWidget, Ui_dockerVMConfigPageWidget):
-    """QWidget configuration page for Docker images."""
+class DockerVMConfigurationPage(QtWidgets.QWidget, Ui_dockerVMConfigPageWidget):
+    """
+    QWidget configuration page for Docker images
+    """
 
     def __init__(self):
 
diff --git a/gns3/modules/iou/pages/iou_device_configuration_page.py b/gns3/modules/iou/pages/iou_device_configuration_page.py
index 79ac5630..fd40ef61 100644
--- a/gns3/modules/iou/pages/iou_device_configuration_page.py
+++ b/gns3/modules/iou/pages/iou_device_configuration_page.py
@@ -21,7 +21,7 @@ Configuration page for IOU devices.
 
 import os
 
-from gns3.qt import QtGui, QtWidgets
+from gns3.qt import QtWidgets
 from gns3.local_server import LocalServer
 from gns3.dialogs.node_properties_dialog import ConfigurationError
 from gns3.dialogs.symbol_selection_dialog import SymbolSelectionDialog
diff --git a/gns3/modules/qemu/pages/qemu_vm_configuration_page.py b/gns3/modules/qemu/pages/qemu_vm_configuration_page.py
index 73da97ca..ee1cc8a6 100644
--- a/gns3/modules/qemu/pages/qemu_vm_configuration_page.py
+++ b/gns3/modules/qemu/pages/qemu_vm_configuration_page.py
@@ -26,7 +26,7 @@ from collections import OrderedDict
 from gns3.modules.qemu.dialogs.qemu_image_wizard import QemuImageWizard
 from gns3.dialogs.symbol_selection_dialog import SymbolSelectionDialog
 from gns3.node import Node
-from gns3.qt import QtGui, QtCore, QtWidgets, qpartial
+from gns3.qt import QtCore, QtWidgets, qpartial
 from gns3.modules.module_error import ModuleError
 from gns3.dialogs.node_properties_dialog import ConfigurationError
 from gns3.image_manager import ImageManager
diff --git a/gns3/modules/virtualbox/pages/virtualbox_vm_configuration_page.py b/gns3/modules/virtualbox/pages/virtualbox_vm_configuration_page.py
index 7ff22c98..80edf48e 100644
--- a/gns3/modules/virtualbox/pages/virtualbox_vm_configuration_page.py
+++ b/gns3/modules/virtualbox/pages/virtualbox_vm_configuration_page.py
@@ -19,7 +19,7 @@
 Configuration page for VirtualBox VMs.
 """
 
-from gns3.qt import QtGui, QtWidgets
+from gns3.qt import QtWidgets
 from gns3.dialogs.node_properties_dialog import ConfigurationError
 from gns3.dialogs.symbol_selection_dialog import SymbolSelectionDialog
 from gns3.node import Node
diff --git a/gns3/modules/vmware/pages/vmware_vm_configuration_page.py b/gns3/modules/vmware/pages/vmware_vm_configuration_page.py
index 91f31e79..c553b514 100644
--- a/gns3/modules/vmware/pages/vmware_vm_configuration_page.py
+++ b/gns3/modules/vmware/pages/vmware_vm_configuration_page.py
@@ -19,7 +19,7 @@
 Configuration page for VMware VMs.
 """
 
-from gns3.qt import QtGui, QtWidgets
+from gns3.qt import QtWidgets
 from gns3.dialogs.node_properties_dialog import ConfigurationError
 from gns3.dialogs.symbol_selection_dialog import SymbolSelectionDialog
 from gns3.node import Node
diff --git a/gns3/modules/vpcs/pages/vpcs_node_configuration_page.py b/gns3/modules/vpcs/pages/vpcs_node_configuration_page.py
index c570d355..bc2524d5 100644
--- a/gns3/modules/vpcs/pages/vpcs_node_configuration_page.py
+++ b/gns3/modules/vpcs/pages/vpcs_node_configuration_page.py
@@ -20,7 +20,7 @@ Configuration page for VPCS nodes
 """
 
 import os
-from gns3.qt import QtGui, QtWidgets
+from gns3.qt import QtWidgets
 from gns3.local_server import LocalServer
 from gns3.node import Node
 
diff --git a/gns3/ui/node_properties_dialog.ui b/gns3/ui/node_properties_dialog.ui
index 3ed3894a..775e9690 100755
--- a/gns3/ui/node_properties_dialog.ui
+++ b/gns3/ui/node_properties_dialog.ui
@@ -155,7 +155,7 @@ to display the configuration page.</string>
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
      </property>
     </widget>
    </item>
diff --git a/gns3/ui/node_properties_dialog_ui.py b/gns3/ui/node_properties_dialog_ui.py
index 0ce69e30..57bfc7b0 100644
--- a/gns3/ui/node_properties_dialog_ui.py
+++ b/gns3/ui/node_properties_dialog_ui.py
@@ -1,16 +1,14 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file '/Users/noplay/code/gns3/gns3-gui/gns3/ui/node_properties_dialog.ui'
+# Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/ui/node_properties_dialog.ui'
 #
-# Created by: PyQt5 UI code generator 5.4.2
+# Created by: PyQt5 UI code generator 5.5.1
 #
 # WARNING! All changes made in this file will be lost!
 
 from PyQt5 import QtCore, QtGui, QtWidgets
 
-
 class Ui_NodePropertiesDialog(object):
-
     def setupUi(self, NodePropertiesDialog):
         NodePropertiesDialog.setObjectName("NodePropertiesDialog")
         NodePropertiesDialog.resize(689, 454)
@@ -70,7 +68,7 @@ class Ui_NodePropertiesDialog(object):
         self.gridlayout.addWidget(self.splitter, 0, 0, 1, 1)
         self.uiButtonBox = QtWidgets.QDialogButtonBox(NodePropertiesDialog)
         self.uiButtonBox.setOrientation(QtCore.Qt.Horizontal)
-        self.uiButtonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Apply | QtWidgets.QDialogButtonBox.Cancel | QtWidgets.QDialogButtonBox.Ok | QtWidgets.QDialogButtonBox.Reset)
+        self.uiButtonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Apply|QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Help|QtWidgets.QDialogButtonBox.Ok|QtWidgets.QDialogButtonBox.Reset)
         self.uiButtonBox.setObjectName("uiButtonBox")
         self.gridlayout.addWidget(self.uiButtonBox, 1, 0, 1, 1)
 
@@ -84,6 +82,6 @@ class Ui_NodePropertiesDialog(object):
         self.uiNodesTreeWidget.headerItem().setText(0, _translate("NodePropertiesDialog", "Nodes"))
         self.uiTitleLabel.setText(_translate("NodePropertiesDialog", "Node Configuration"))
         self.textLabel.setText(_translate("NodePropertiesDialog", "Please select a node in the list \n"
-                                          "to display the configuration page."))
+"to display the configuration page."))
 
 from . import resources_rc