2.0.2

Show a default symbol in case of corrupted file
Fix https://github.com/GNS3/gns3-server/issues/1043
2026-06-01 16:22:04 +03:00 · 2017-05-30 09:02:02 +02:00 · 2017-05-24 12:26:18 +02:00 · 2017-05-23 18:00:02 +02:00 · 2017-05-23 17:25:29 +02:00 · 2017-05-23 15:54:35 +02:00
217 changed files with 136535 additions and 136111 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,16 @@
 sudo: required
-
 services:
-  - docker
-
+- docker
 notifications:
  email: false
-  #email:
-  #  - julien@gns3.net
-  #irc:
-  #  channels:
-  #    - "chat.freenode.net#gns3"
-  #  on_success: change
-  #  on_failure: always
-
 script:
 - docker build -t gns3-gui-test .
- docker run gns3-gui-test 
-
+- docker run gns3-gui-test
+deploy:
+  provider: pypi
+  user: noplay
+  password:
+    secure: FofcqlJjgqf2jaDaXpLHeigVoexbrOz3WwnDuiJpwJxeFUlPY8s2cQs/Bm+dzxzZaOaGiVE0A83v/Xa10yD5tflThHt4sqYJK3iQCinA7wgeAlDimB4xrWUNplfNJZ/Eod5Ssa++E02W+3i29PxpXY//mjCY7qDxaoxul1gnFJY=
+  on:
+    tags: true
+    repo: GNS3/gns3-gui
--- a/362
+++ b/362
@@ -1,5 +1,348 @@
 # Change Log

+## 2.0.2 30/05/2017
+
+* Show a default symbol in case of corrupted file
+* When another gui is already running exit instead of proper close to avoid any issue
+* Fix duplicate on remote server use wrong location
+* Display the location of settings when we disallow opening due to old release
+* Improve search for dynamips in development on OSX
+* Fix error display when loading a .png custom symbol
+* Fix a crash in the progress dialog
+* Fix a race condition when exporting a closed project
+* Fix RuntimeError: wrapped C/C++ object of type NodeItem has been deleted
+
+## 2.0.1 16/05/2017
+
+* Improve inline help. Fixes #1999. Add a warning about wifi interfaces in the cloud. Fixes #1902.
+* Copy remote directory path into clipboard in "Show in FileManager". Fixes #1966.
+* Fix display of error in progress dialog when we don't have thread
+* Fix lost slot and port in dynamips settings
+* Do not run import / export of project in seperate thread
+* Assert when running an HTTP query outside the main thread
+* Proper error when you try to load the pid file as config file
+* Log malformed svg text item
+* Fix a race condition when right click and delete a node at the same time
+* Fix a race condition when snapshoting a closed project
+* Update doctor_dialog.py
+* Catch remaining missing function listxattr on some Linux host.
+* Fix a race condition when creating node and closing project
+* Fix error if you put a path in a .gns3a file for qemu
+* Fix AttributeError: 'NoneType' object has no attribute '_refreshVisibleWidgets'
+* Do not crash if the logging code raise an exception
+* Fix some crash in dynamips device preference page
+* Fix warning when loading IOU images on Windows
+* Do not crash if you don't have configure a packet capture program on Windows
+* Ignore error when we can't kill the packet capture
+* Fix AttributeError: 'NoneType' object has no attribute 'wasCanceled'
+* Fix RuntimeError: wrapped C/C++ object of type QComboBox has been deleted
+* Fix RuntimeError: wrapped C/C++ object of type QTreeWidgetItem has been deleted
+* Fix detection of https when use for the local server
+* Silent the _COMPIZ_TOOLKIT_ACTION warning
+* Cacth TypeError: native Qt signal is not callable
+* Fix AttributeError: 'C7200' object has no attribute 'warning_signal'
+* Catch missing function listxattr on some linux host
+* Disallow opening a .gns3 on a remote server
+* Fix project closing when we have multiple client connected
+
+## 2.0.0 02/05/2017
+
+* Clarify that we don't override vmware custom adapters
+* Strip space from path at project creation
+
+## 2.0.0rc4 20/04/2017
+
+* Catch all error during the generation of log messages.
+* Catch a rare node creation error
+* Fix missing menu text at application startup
+* Fix a race condition in the drawing item
+* Catch system error when connecting to local server
+* Catch a rare error when killing the capture
+* Improve pcap streaming speed
+* Upgrade to 5.7.1
+* Recent projects list bug
+* Fix a race condition in the preferences dialog
+* Try to fix some windows Z issues
+* Catch a garbage collection issue in the right click on a link
+* Fix a compatibility issue with Python 3.4
+
+## 1.5.4 13/04/2017
+
+* Limit ubridge permission to the admin group on OSX
+* Upgrade to Qt 5.7.1 on Windows
+
+## 2.0.0rc3 31/03/2017
+
+* Improve timeout handling
+* Improve logging when we display a qt message box
+* Try to detect computer hibernation
+* Fix crash when we send some errors to the user console
+* Use QtFile for managing file capture
+* Allow to delete a profile from the profile select dialog
+* Filter hidden folder in the profil directory
+* Prevent user putting port in the remote host name
+* Fix RuntimeError: wrapped C/C++ object of type EllipseItem has been deleted
+* Fix a rare error in LinkItem
+* Fix Image field in nodes list is stale after changing an image
+* Fix RuntimeError: Set changed size during iteration
+* Better detection of remote server changes
+* Add a notice about the fact you need to apply server settings
+* Check python version only for setup.py install
+* Catch appliance error when creating an appliance new version
+* If a node can't be deleted do not remove it
+* If something is wrong during packet capture do not disconnect us from the server
+* Fix saving dynamips
+* Try to fix the hang dialog on some computers
+* Fix a rare crash in progress dialog
+* If we pass --profile skip the profile select dialog
+* Raise an error if the progress dialog is not created from the main thread
+* Log qt log to python log
+* Fix image are not uploaded to remote main server
+* Fix race condition when editing a project
+* Poll settings each 5 seconds
+* Avoid progress dialog not disapear
+* Remove wrong mention about the fact super putty is include
+* Avoid a crash when an ios router don't have a chassis
+* Fix a potentatial crash in the progress dialog
+* Support official docker images in appliances
+
+## 2.0.0rc2 10/03/2017
+
+* Deploy on pypi when we tag
+* Fix rare crash in GNS3 VM preference page
+* Fix an error on Windows when loading SVG files
+* Prevent a potential crash
+* Workaround a rare crash when sending analytics
+* Catch error when you try to create a node a not existing server
+* Fix an error when your local server crash and computer return non unicode
+* Fix KeyError: 'slot1'
+* Fix a rare crash in import appliance
+* Rollback to PyQT 5.8 because 5.8.1 seem to have trouble at install
+* Update pyqt5 from 5.8 to 5.8.1
+
+## 2.0.0 RC 1 06/03/2017
+
+* UltraVNC support
+* Display less noisy dialog when we can't connect to the remote server
+* Prevent the usage of gns3vm as a remote server name
+* Fix the VMware wizard for not using a remote server by default
+* Prevent the GNS3 VM to appear in remote compute in the VM wizard
+* Remove iouyap settings
+* Fix missing permission error management
+* Avoid a crash when create a new dynamips version in the appliance wizard
+* Disallow user to add the same server as a remote server and as local server
+* Fix 'module' object has no attribute 'run'
+* Monitor and display local server stderr
+* Fix some import errors
+* Remove placeholder string from appliance wizard
+* Avoiding calling multiple time /computes at the same time. And reduce timeout
+* Support for appliance v4
+* Some tweaks for enabling/disabling HDPI mode.
+* Do not display error at first step of the setup wizard
+* Disable HDPI by default on Linux and allow to configure it
+* Fix an issue when you edit a VPCS node from the node view
+* Catch a race condition in managing error static assets download
+* Handle error if you try to import an appliance without having the images
+* Improve crash proof code of the progress dialog
+
+## 2.0.0 beta 4 19/01/2017
+
+* Update pyqt5 from 5.7.1 to 5.8
+* Drop from console view the show command not supported by 2.0
+* Try to avoid segfault in some PyQT version
+* Support for strike and underline
+* Do not use native font selector on mac it could crash
+* Use a dedicated QNetwork manager for notification
+* Fix a display error in console error message
+* Use signal for writting on console to avoid some potential segfault
+* Fix a rare warning
+* Add more debug when we have an http error
+* Disable timeout on project open
+* Support for gvncviewer
+* Fix a rare crash in the file editor dialog
+* Fix a race condition when we display the error
+* Fix an issue with invalid hostname detected as an IPV6
+* When you update a a node from the node view send settings to controller
+* Fix error when permission on the loaded image is broken
+* Fix crash with invalid image file in appliance wizard
+* Fix error when loading an handmade appliance file
+* Fix no error if your VNC client is not configured
+* Avoid high cpu usage when connection is lost
+* Support {name} in cloud template
+* Fix text of the export dialog
+* Fix error message when a project is already open
+* Fix missing info in tooltip of ethernet switch
+* The server manage the vmname when we update the linked virtual box VM
+* Fix z value for text
+* Avoid a segfault when display an error
+* Add sata options in the appliance schema
+* Fix a rare crash when exporting IOU configurations
+* Allow additionnal properties in registry files
+* Fix a potential crash when a symbol is not found
+* Strip unused code for OVA support in the registry
+* Increase the timeout for killing local server
+* Fix error when changing the layer of a drawing item
+* Fix double click for open file on OSX
+* Add debug to see the arguments use to start the application
+* Put the selected engine in the first position of the listbox
+* Fix rare crash with dynamips
+* Fix rare crash in the progress dialog
+* Fix a rare crash in console view
+* Fix crash when you drag a file inside GNS3
+
+## 2.0.0 beta 3 19/01/2017
+
+* Fix error if you already have an image with a different name on remote server
+* Drop gns3 converter from requirements
+* Show correct server name in tooltip
+* Menu item to open controller webpage
+* Fixes potential exception when adding network module to an IOS router. Fixes #1774.
+* Do not export a file config file if empty
+* Allow to set console type in qemu wizard
+* Fix overwrite of projects
+* Fix creation of new appliance version when filename is different
+* Fix you can't configure port 0 on ethernet switch
+* Fix a race condition when saving as a project and closing it
+* Reorder multi link when you delete one
+* Ensure we can't connect to occupy port
+* Fix AttributeError: 'QImageSvgRenderer' object has no attribute '_svg'
+* Fix Unsaved preferences in GNS3 VM warning
+* Force margins in configuration tabs.
+* Sata disk interface support for Qemu VMs.
+* Remove "sata" disk interface. Does not exist in Qemu. Ref #1749
+* Add SATA and none disk interfaces on Qemu VM configuration page. Fixes #1749.
+* Update pyqt5 from 5.7 to 5.7.1
+* Fix TypeError: argument of type 'NoneType' is not iterable
+* Fix an error when you edit readme and no projet is opened
+* Upgrade Qt 5.7
+
+## 1.5.3 12/01/2017
+
+* Upgrade Qt 5.7
+
+## 2.0.0 beta 2 20/12/2016
+
+* AUX console button text change in MainWindow.
+* Fix GNS3 Client not connecting to remote controller
+* Delete from project list deleted projects
+* Keep a shared list of projects internally
+* Fix recent files in new project dialog
+* Move recent projects to the file menu
+* Fix Tail process for wireshark trace not killed when we change project
+* Move project menu items. Ref #1713.
+* Display recent files for local controller, recent project for remote controller
+* Do not display the remote server if the server is use as a GNS3 VM
+* If the notification stream is stopped by something we auto reconnect
+* Ignore system proxy to avoid trouble with "Security Suites"
+* Avoid close and delete a project at the same time
+* Alpha sort of servers summaries
+* Fix new remote server doesn't show up in compute summary
+* Fix interface number for Switch & Hub templates
+* Fix sync of node alignements with the server
+* Fix rare condition when you close a project and add a node
+* Options -q for quiet startup
+* Fix an error when apply permission on OSX
+* Support Qemu cpus in GNS3A
+* Support for BIOS images
+* Fix IdlePC can't be found during setup wizard
+
+## 2.0.0 beta 1 07/12/2016
+
+* Use osascript on OSX for asking admin permission
+* Change the method for creating the tmpdir for symbols cache
+* Fix a connection error at the end of the setup wizard
+* Change how some tabs are organized or named.
+* General settings => local settings
+* Drop more reference to use local server
+* Remove local server checkbox from preferences
+* Make sure to not start local server during setup wizard remote server
+* Fix Error when editing IOS image created using .gns3a file
+* Fix test suites around sip deleted
+* Do not auto start the local server in setup wizard
+* On OSX execute all sudo in a single operation
+* Catch key Compute  is missing during conversion error
+* Fix rare crash in gns3.dialogs.appliance_wizard in validateCurrentPage
+* Fix  AttributeError: 'Nat' object has no attribute 'configPage'
+* Catch one more RuntimeError: wrapped C/C++
+* Fix a rare crash in port
+* Fix a rare crash when set symbol
+* Fix a potential crash
+* Fix a potential crash at exit
+* Fix crashes
+* Remove unused settings from general preferences
+* Catch error when you try to import a IOU bin as a licence
+* Fix rare crash when exiting
+* Fix crash when freeing some ressources
+* Fix timeout when exporting large project
+* Avoid a rare crash when we free a port
+* Fix you can't download symbols after you got an error
+
+## 2.0.0 alpha 4 24/11/2016
+* Mark preferences changes when you change a QPlainTextEdit
+* Force the VPCS config initial file
+* Replace the IOU licence path by an input text
+* Fix 403 when loading a remote project
+* Fix some possible server not starting on Windows
+* Hide the connection refused dialog when we success to reconnect
+* Avoid a rare crash when changing topology
+* When loading another project disconnect from current project
+* Do not crash if we can't list remote list of GNS3 VM engines
+* Init the VPCS base config
+* Fix invalid ressource path on OSX
+* Fix segfault when deleting a node
+* Do not download multiple time the same symbol
+* Kill tail process when capture stop
+* Fix Topology summary contain non existing links
+* Fix a rare crash when deleting a link
+* Fix export of debug informations when not connected to the controller
+* Fix AttributeError: 'DockerVM' object has no attribute 'server'
+* Fix error message if you double click on builtin switch
+* Fix a rare crash in packet capture
+* Restrict ubridge to admin users on OSX
+* Natural sort of Nodes in topology summary
+* Drop serial console type
+* Display an error if you try to open a 0.8.x file
+* Fix tab order when editing a compute
+* Fix a crash in ethernet switch settings
+* Dissallow unknown extensions
+
+## 2.0.0 alpha 3 28/10/2016
+* Fix error when opening a project from the cli with a gns3 installed via setup.py
+* Fix a rare crash in snapshot dialog
+* Fix crash when importing project on a remote server
+* Fix crash in appliance wizard
+* Fix crash when local server is not available
+* Disallow  to overwrite a running project
+* Fix a rare crash when deleting a link
+* Fix appliance with wrong file name after import
+* Fix a crash at startup on Mac when coming from old GNS3 version
+* Fix key error in settings  if a compute no longer exists
+* All check for vmware linked base are already made server side
+* Fix Save as is not switching to the saved project
+* Auto reopen a project if connection is lost
+* Empty the list of computes nodes when connection is lost
+* Try to fix duplicate nodes after snapshot restore on some user computer
+* Allow only IPV4 in setup wizard
+* Catch error if user tmp directory is read only
+* Raise a proper error if packet capture program is invalid
+* Fix AttributeError: 'NoneType' object has no attribute 'upper'
+* Fix rare crash when killing wireshark
+* Export debug informations also from the controller
+* Fix a crash in vm wizard
+* Fix error when uploading an images from preferences
+* Fix snap to grid when initialy drop a node in the topology
+* Optimize snap-to-grid code
+* Fix a crash with linked clone
+* Move prevent using twice the same VM when linked clone is not enable
+* Fix If you show interface label and delete the link ghost interface label will appear
+* Display short interface label instead of long version
+* Fix error  AttributeError: 'NoneType' object has no attribute 'capabilities'
+* Fix PermissionError when killing local server
+* Handle empty color
+* Fix rare crash in save as
+* Fix crash in restore default server settings
+* Fix an error during import of some 0.8x projects
+
 ## 2.0.0 alpha 2 20/10/2016

 * Support pure remote server for importing appliance
@@ -78,6 +421,25 @@
 * Edit the scene size
 * New API

+
+## 1.5.3 rc1 20/12/2016
+
+* Fix Error when editing IOS image created using .gns3a file
+* Fix error when opening a project from the cli with a gns3 installed via setup.py
+* Fix a crash at startup on Mac when coming from old GNS3 version
+* Fix an error during import of some 0.8x projects
+* Ask for restart after installing vmrun
+* Improve warning when connection issue to GNS3 VM
+* Changes wording in VM wizards.
+* Changed sentence.
+* Display an error if settings come from a more recent version of GNS3
+* Fix Error when no GNS3 VM is configured and you click on new Docker or IOU
+* Disallow / in docker container name
+* Update iTerm3 console settings
+* Fix rename ethernet switch doesn't release the name
+* Support for VNC display number in command line replacement
+* Fix a crash when a directory with image is not accessible at gns3a import
+
 ## 1.5.2 18/08/2016

 * Make more clear that VMware VM are not ESXi
--- a/README.rst
+++ b/README.rst
@@ -40,3 +40,8 @@ Or start the app with --debug flag.
 Due to the fact PyQT intercept you can use a web debugger for inspecting stuff:
 https://github.com/Kozea/wdb

+Security issues
+----------------
+Please contact us using contact informations available here:
+http://docs.gns3.com/1ON9JBXSeR7Nt2-Qum2o3ZX0GU86BZwlmNSUgvmqNWGY/index.html
+
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -0,0 +1,19 @@
+version: '{build}-{branch}'
+
+image: Visual Studio 2015
+
+platform: x64
+
+environment:
+    PYTHON: "C:\\Python36-x64"
+    DISTUTILS_USE_SDK: "1"
+
+install:
+   - cinst nmap
+   - "%PYTHON%\\python.exe -m pip install -r dev-requirements.txt"
+   - "%PYTHON%\\python.exe -m pip install -r win-requirements.txt"
+
+build: off
+
+test_script:
+   - "%PYTHON%\\python.exe -m pytest -v"
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1,7 +1,6 @@
 -rrequirements.txt

 pep8==1.7.0
-pytest==3.0.3
+pytest==3.1.0
 pytest-pythonpath==0.7.1 # useful for running tests outside tox
-pytest-timeout==1.0.0
-pytest-capturelog==0.7
+pytest-timeout==1.2.0
--- a/gns3/application.py
+++ b/gns3/application.py
@@ -29,14 +29,20 @@ log = logging.getLogger(__name__)
 class Application(QtWidgets.QApplication):
    file_open_signal = QtCore.pyqtSignal(str)

-    def __init__(self, argv):
+    def __init__(self, argv, hdpi=True):

        self.setStyle(QtWidgets.QStyleFactory.create("Fusion"))
        # both Qt and PyQt must be version >= 5.6 in order to enable high DPI scaling
        if parse_version(QtCore.QT_VERSION_STR) >= parse_version("5.6") and parse_version(QtCore.PYQT_VERSION_STR) >= parse_version("5.6"):
            # only available starting Qt version 5.6
-            self.setAttribute(QtCore.Qt.AA_EnableHighDpiScaling)
-            self.setAttribute(QtCore.Qt.AA_UseHighDpiPixmaps)
+            if hdpi:
+                if sys.platform.startswith("linux"):
+                    log.warning("HDPI mode is enabled. HDPI support on Linux is not fully stable and GNS3 may crash depending of your version of Linux. To disabled HDPI mode please edit ~/.config/GNS3/gns3_gui.conf and set 'hdpi' to 'false'")
+                self.setAttribute(QtCore.Qt.AA_EnableHighDpiScaling)
+                self.setAttribute(QtCore.Qt.AA_UseHighDpiPixmaps)
+            else:
+                log.info("HDPI mode is disabled")
+                self.setAttribute(QtCore.Qt.AA_DisableHighDpiScaling)

        super().__init__(argv)

--- a/gns3/base_node.py
+++ b/gns3/base_node.py
@@ -46,7 +46,6 @@ class BaseNode(QtCore.QObject):
    loaded_signal = QtCore.Signal()
    deleted_signal = QtCore.Signal()
    error_signal = QtCore.Signal(int, str)
-    warning_signal = QtCore.Signal(int, str)
    server_error_signal = QtCore.Signal(int, str)

    _instance_count = 1
@@ -90,7 +89,10 @@ class BaseNode(QtCore.QObject):
        self._links.add(link)

    def deleteLink(self, link):
-        self._links.remove(link)
+        try:
+            self._links.remove(link)
+        except KeyError:
+            pass

    @classmethod
    def reset(cls):
@@ -314,7 +316,6 @@ class BaseNode(QtCore.QObject):

        self._project.get(path, callback, context=context, **kwargs)

-
    def controllerHttpDelete(self, path, callback, context={}, **kwargs):
        """
        Delete on current server / project
--- a/gns3/compute.py
+++ b/gns3/compute.py
@@ -29,7 +29,7 @@ class Compute:
        self._compute_id = compute_id
        self._name = compute_id
        self._connected = False
-        self._protocol = None
+        self._protocol = "http"
        self._host = None
        self._port = 3080
        self._user = None
--- a/gns3/compute_manager.py
+++ b/gns3/compute_manager.py
@@ -40,6 +40,7 @@ class ComputeManager(QtCore.QObject):
        self._computes = {}
        self._controller = Controller.instance()
        self._controller.connected_signal.connect(self._controllerConnectedSlot)
+        self._controller.disconnected_signal.connect(self._controllerDisconnectedSlot)
        self._controllerConnectedSlot()

        # If we receive fresh data from the notification feed no need to refresh via an API call
@@ -47,19 +48,30 @@ class ComputeManager(QtCore.QObject):

        self._timer = QtCore.QTimer()
        self._timer.setInterval(1000)
+        self._refreshingComputes = False
        self._timer.timeout.connect(self._refreshComputesSlot)
        self._timer.start()

    def _refreshComputesSlot(self):
+        if self._refreshingComputes:
+            return
        if self._controller.connected() and datetime.datetime.now().timestamp() - self._last_computes_refresh > 5:
            self._last_computes_refresh = datetime.datetime.now().timestamp()
-            self._controller.get("/computes", self._listComputesCallback, showProgress=True)
+            self._refreshingComputes = True
+            self._controller.get("/computes", self._listComputesCallback, showProgress=False, timeout=15)

    def _controllerConnectedSlot(self):
        if self._controller.connected():
-            self._controller.get("/computes", self._listComputesCallback)
+            self._refreshingComputes = True
+            self._controller.get("/computes", self._listComputesCallback, showProgress=False, timeout=15)
+
+    def _controllerDisconnectedSlot(self):
+        for compute_id in list(self._computes):
+            del self._computes[compute_id]
+            self.deleted_signal.emit(compute_id)

    def _listComputesCallback(self, result, error=False, **kwargs):
+        self._refreshingComputes = False
        if error is True:
            log.error("Error while getting compute list: {}".format(result["message"]))
            return
@@ -95,11 +107,25 @@ class ComputeManager(QtCore.QObject):
        else:
            self.updated_signal.emit(compute_id)

+    def computeIsTheRemoteGNS3VM(self, compute):
+        """
+        :returns: Boolean True if the remote server is the remote GNS3 VM
+        """
+        if compute.id() != "local" and compute.id() != "vm":
+            if self.vmCompute() and "GNS3 VM ({})".format(compute.name()) == self.vmCompute().name():
+                return True
+        return False
+
    def computes(self):
        """
        :returns: List of computes nodes
        """
-        return list(self._computes.values())
+        computes = []
+        for compute in self._computes.values():
+            # We filter the remote GNS3 VM compute from the computes list
+            if not self.computeIsTheRemoteGNS3VM(compute):
+                computes.append(compute)
+        return computes

    def vmCompute(self):
        """
@@ -125,7 +151,10 @@ class ComputeManager(QtCore.QObject):

        With a remote controller it could be different of our local platform
        """
-        return self.localCompute().capabilities().get("platform", sys.platform)
+        c = self.localCompute()
+        if c is None:
+            return sys.platform
+        return c.capabilities().get("platform", sys.platform)

    def remoteComputes(self):
        """
@@ -171,12 +200,14 @@ class ComputeManager(QtCore.QObject):
                        log.debug("Update compute %s", compute_id)
                        self._controller.put("/computes/" + compute_id, None, body=c.__json__())
                        self._computes[compute_id] = c
+                        self.updated_signal.emit(compute_id)
        # Create the new nodes
        for compute in computes:
            if compute.id() not in self._computes:
                log.debug("Create compute %s", compute.id())
                self._controller.post("/computes", None, body=compute.__json__())
                self._computes[compute.id()] = compute
+                self.created_signal.emit(compute.id())

    @staticmethod
    def reset():
--- a/gns3/compute_summary_view.py
+++ b/gns3/compute_summary_view.py
@@ -76,6 +76,7 @@ class ComputeItem(QtWidgets.QTreeWidgetItem):
            else:
                self._status = "stopped"
                self.setIcon(0, QtGui.QIcon(':/icons/led_red.svg'))
+        self._parent.sortItems(0, QtCore.Qt.AscendingOrder)


 class ComputeSummaryView(QtWidgets.QTreeWidget):
@@ -106,17 +107,26 @@ class ComputeSummaryView(QtWidgets.QTreeWidget):
        """

        compute = ComputeManager.instance().getCompute(compute_id)
+        if ComputeManager.instance().computeIsTheRemoteGNS3VM(compute):
+            return
        self._computes[compute_id] = ComputeItem(self, compute)

    def _computeUpdatedSlot(self, compute_id):
        """
-        Called when a compute is removed to the list of computes
+        Called when a compute is updated

        :params url: URL of the compute
        """

        if compute_id in self._computes:
-            self._computes[compute_id]._refreshStatusSlot()
+            compute = ComputeManager.instance().getCompute(compute_id)
+            # We hide the remote GNS3 VM
+            if ComputeManager.instance().computeIsTheRemoteGNS3VM(compute):
+                self._computeRemovedSlot(compute_id)
+            else:
+                self._computes[compute_id]._refreshStatusSlot()
+        else:
+            self._computeAddedSlot(compute_id)

    def _computeRemovedSlot(self, compute_id):
        """
--- a/gns3/console_cmd.py
+++ b/gns3/console_cmd.py
@@ -249,44 +249,6 @@ class ConsoleCmd(cmd.Cmd):
                    print("{}: no such device".format(node_name))
                    continue

-    def _show_run(self, params):
-        """
-        Handles the 'show run' command.
-
-        :param params: list of parameters
-        """
-
-        if self._topology.project is None:
-            print("Sorry, the project hasn't been saved yet")
-            return
-
-        topology = self._topology.dump()
-        if len(params) == 1:
-            # print out whole topology
-            print(json.dumps(topology, sort_keys=True, indent=4))
-        elif len(params) >= 2:
-            # this is a 'show run <device_name>'
-            params.pop(0)
-            for param in params:
-                node_name = param
-                base_node_id = None
-
-                # get the node ID
-                for node in self._topology.nodes():
-                    if node.name() == node_name:
-                        base_node_id = node.id()
-                        break
-
-                if base_node_id is None:
-                    print("{}: no such device".format(node_name))
-                    continue
-
-                if "nodes" in topology["topology"]:
-                    for node in topology["topology"]["nodes"]:
-                        if node["id"] == base_node_id:
-                            print(json.dumps(node, sort_keys=True, indent=4))
-                            break
-
    def do_show(self, args):
        """
        Show detail information about every device in current lab:
@@ -294,15 +256,6 @@ class ConsoleCmd(cmd.Cmd):

        Show detail information about a device:
        show device <device_name>
-
-        Show the whole topology:
-        show run
-
-        Show topology info of a device:
-        show run <device_name>
-
-        Show the GNS3 VM status
-        show gns3vm
        """

        if '?' in args or args.strip() == "":
@@ -312,10 +265,6 @@ class ConsoleCmd(cmd.Cmd):
        params = args.split()
        if params[0] == "device":
            self._show_device(params)
-        elif params[0] == "run":
-            self._show_run(params)
-        elif params[0] == "gns3vm":
-            self._show_gnsvm(params)
        else:
            print(self.do_show.__doc__)

--- a/gns3/console_view.py
+++ b/gns3/console_view.py
@@ -15,11 +15,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

-import platform
 import sys
+import sip
 import struct
 import inspect
 import datetime
+import platform

 from .qt import QtCore, Qt
 from .topology import Topology
@@ -39,6 +40,9 @@ class ConsoleLogHandler(logging.StreamHandler):
    """

    def emit(self, record):
+        if sip.isdeleted(self._console_view):
+            return
+
        message = self.format(record)
        level_no = record.levelno
        if level_no >= logging.ERROR:
@@ -187,11 +191,9 @@ class ConsoleView(PyCutExt, ConsoleCmd):
        """

        text = "Server notification: {}".format(message)
-        self.write(text, error=True)
-        self.write("\n")
        if details:
-            self.write(details)
-            self.write("\n")
+            text += "\n" + details
+        self.write_message_signal.emit(text, "info")

    def writeError(self, base_node_id, message):
        """
@@ -208,8 +210,7 @@ class ConsoleView(PyCutExt, ConsoleCmd):

        text = "Error:{name} {message}".format(name=name,
                                               message=message)
-        self.write(text, error=True)
-        self.write("\n")
+        self.write_message_signal.emit(text, "error")

    def writeWarning(self, base_node_id, message):
        """
@@ -226,8 +227,7 @@ class ConsoleView(PyCutExt, ConsoleCmd):

        text = "Warning:{name} {message}".format(name=name,
                                                 message=message)
-        self.write(text, warning=True)
-        self.write("\n")
+        self.write_message_signal.emit(text, "warning")

    def writeServerError(self, base_node_id, message):
        """
@@ -248,8 +248,7 @@ class ConsoleView(PyCutExt, ConsoleCmd):
        text = "Server error {server}:{name} {message}".format(server=server,
                                                               name=name,
                                                               message=message)
-        self.write(text.strip(), error=True)
-        self.write("\n")
+        self.write_message_signal.emit(text.strip(), "error")

    def _run(self):
        """
--- a/gns3/controller.py
+++ b/gns3/controller.py
@@ -19,7 +19,7 @@ import os
 import hashlib
 import tempfile

-from .qt import QtCore, QtGui, QtWidgets, qpartial
+from .qt import QtCore, QtGui, QtWidgets, qpartial, qslot
 from .symbol import Symbol
 from .local_server_config import LocalServerConfig
 from .settings import LOCAL_SERVER_SETTINGS
@@ -33,16 +33,24 @@ class Controller(QtCore.QObject):
    An instance of the GNS3 server controller
    """
    connected_signal = QtCore.Signal()
+    disconnected_signal = QtCore.Signal()
    connection_failed_signal = QtCore.Signal()
+    project_list_updated_signal = QtCore.Signal()

    def __init__(self, parent=None):
        super().__init__()
        self._connected = False
        self._connecting = False
-        self._cache_directory = tempfile.TemporaryDirectory()
+        self._cache_directory = tempfile.mkdtemp()
        self._http_client = None
        # If it's the first error we display an alert box to the user
        self._first_error = True
+        self._error_dialog = None
+        self._display_error = True
+        self._projects = []
+
+        # If we do multiple call in order to download the same symbol we queue them
+        self._static_asset_download_queue = {}

    def host(self):
        return self._http_client.host()
@@ -78,10 +86,32 @@ class Controller(QtCore.QObject):
        """
        self._http_client = http_client
        if self._http_client:
+            if self.isRemote():
+                self._http_client.setMaxTimeDifferenceBetweenQueries(120)
            self._http_client.connection_connected_signal.connect(self._httpClientConnectedSlot)
+            self._http_client.connection_disconnected_signal.connect(self._httpClientDisconnectedSlot)
+            self._connectingToServer()
+
+    def setDisplayError(self, val):
+        """
+        Allow error to be visible or not
+        """
+        self._display_error = val
+        self._first_error = True
+
+    def _connectingToServer(self):
+        """
+        Connection process as started
+        """
+        self._connected = False
+        self._connecting = True
+        self.get('/version', self._versionGetSlot)
+
+    def _httpClientDisconnectedSlot(self):
+        if self._connected:
            self._connected = False
-            self._connecting = True
-            self.get('/version', self._versionGetSlot)
+            self.disconnected_signal.emit()
+            self._connectingToServer()

    def _versionGetSlot(self, result, error=False, **kwargs):
        """
@@ -91,19 +121,28 @@ class Controller(QtCore.QObject):
            if self._first_error:
                self._connecting = False
                self.connection_failed_signal.emit()
-                if "message" in result:
-                    QtWidgets.QMessageBox.critical(self.parent(), "Connection", result["message"])
-            # Try to connect again in 1 seconds
-            QtCore.QTimer.singleShot(1000, qpartial(self.get, '/version', self._versionGetSlot, showProgress=self._first_error))
+                if "message" in result and self._display_error:
+                    self._error_dialog = QtWidgets.QMessageBox(self.parent())
+                    self._error_dialog.setWindowModality(QtCore.Qt.ApplicationModal)
+                    self._error_dialog.setWindowTitle("Connection to server")
+                    self._error_dialog.setText("Error when connecting to the GNS3 server:\n{}".format(result["message"]))
+                    self._error_dialog.setIcon(QtWidgets.QMessageBox.Critical)
+                    self._error_dialog.show()
+            # Try to connect again in x seconds
+            QtCore.QTimer.singleShot(5000, qpartial(self.get, '/version', self._versionGetSlot, showProgress=self._first_error))
            self._first_error = False
        else:
            self._first_error = True
+            if self._error_dialog:
+                self._error_dialog.reject()
+                self._error_dialog = None

    def _httpClientConnectedSlot(self):
        if not self._connected:
            self._connected = True
            self._connecting = False
            self.connected_signal.emit()
+            self.refreshProjectList()

    def get(self, *args, **kwargs):
        return self.createHTTPQuery("GET", *args, **kwargs)
@@ -136,7 +175,10 @@ class Controller(QtCore.QObject):
        """
        if compute_id.startswith("http:") or compute_id.startswith("https:"):
            from .compute_manager import ComputeManager
-            return ComputeManager.instance().getCompute(compute_id).id()
+            try:
+                return ComputeManager.instance().getCompute(compute_id).id()
+            except KeyError:
+                return compute_id
        return compute_id

    def put(self, *args, **kwargs):
@@ -183,20 +225,31 @@ class Controller(QtCore.QObject):
            extension = ".svg"
        else:
            extension = ".png"
-        path = os.path.join(self._cache_directory.name, m.hexdigest() + extension)
+        path = os.path.join(self._cache_directory, m.hexdigest() + extension)
        if os.path.exists(path):
            callback(path)
+        elif path in self._static_asset_download_queue:
+            self._static_asset_download_queue[path].append(callback)
        else:
-            self._http_client.createHTTPQuery("GET", url, qpartial(self._getStaticCallback, callback, url, path))
+            self._static_asset_download_queue[path] = [callback]
+            self._http_client.createHTTPQuery("GET", url, qpartial(self._getStaticCallback, url, path))

-    def _getStaticCallback(self, callback, url, path, result, error=False, raw_body=None, **kwargs):
+    def _getStaticCallback(self, url, path, result, error=False, raw_body=None, **kwargs):
        if error:
            log.error("Error while downloading file: {}".format(url))
+            if path in self._static_asset_download_queue:
+                del self._static_asset_download_queue[path]
+            return
+        try:
+            with open(path, "wb+") as f:
+                f.write(raw_body)
+        except OSError as e:
+            log.error("Can't write to {}: {}".format(path, str(e)))
            return
-        with open(path, "wb+") as f:
-            f.write(raw_body)
        log.debug("File stored {} for {}".format(path, url))
-        callback(path)
+        for callback in self._static_asset_download_queue[path]:
+            callback(path)
+        del self._static_asset_download_queue[path]

    def getSymbolIcon(self, symbol_id, callback):
        """
@@ -211,3 +264,29 @@ class Controller(QtCore.QObject):
        icon = QtGui.QIcon()
        icon.addFile(path)
        callback(icon)
+
+    def deleteProject(self, project_id, callback=None):
+        Controller.instance().delete("/projects/{}".format(project_id), qpartial(self._deleteProjectCallback, callback=callback, project_id=project_id))
+
+    def _deleteProjectCallback(self, result, error=False, project_id=None, callback=None, **kwargs):
+        if error:
+            log.error("Error while deleting project: {}".format(result["message"]))
+        else:
+            self.refreshProjectList()
+
+        self._projects = [p for p in self._projects if p["project_id"] != project_id]
+
+        if callback:
+            callback(result, error=error, **kwargs)
+
+    @qslot
+    def refreshProjectList(self, *args):
+        self.get("/projects", self._projectListCallback)
+
+    def _projectListCallback(self, result, error=False, **kwargs):
+        if not error:
+            self._projects = result
+        self.project_list_updated_signal.emit()
+
+    def projects(self):
+        return self._projects
--- a/gns3/crash_report.py
+++ b/gns3/crash_report.py
@@ -51,7 +51,7 @@ class CrashReport:
    Report crash to a third party service
    """

-    DSN = "sync+https://5a35a0b636ef492082c9877fdd94d071:df8a73ef344643cf9100ac70e77fd143@sentry.io/38506"
+    DSN = "sync+https://063691a489374eda912ad454a1d80777:5ddb34d6b23c4a08b040efce23aaac78@sentry.io/38506"
    if hasattr(sys, "frozen"):
        cacert = get_resource("cacert.pem")
        if cacert is not None and os.path.isfile(cacert):
--- a/gns3/dialogs/appliance_wizard.py
+++ b/gns3/dialogs/appliance_wizard.py
@@ -16,14 +16,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

 import os
-import sys
 import sip

 from ..qt import QtWidgets, QtCore, QtGui, qpartial, qslot
 from ..ui.appliance_wizard_ui import Ui_ApplianceWizard
-from ..image_manager import ImageManager
 from ..modules import Qemu
-from ..registry.appliance import Appliance
+from ..registry.appliance import Appliance, ApplianceError
 from ..registry.registry import Registry
 from ..registry.config import Config, ConfigException
 from ..registry.image import Image
@@ -37,11 +35,13 @@ from ..local_config import LocalConfig

 class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
    images_changed_signal = QtCore.Signal()
+    versions_changed_signal = QtCore.Signal()

    def __init__(self, parent, path):
        super().__init__(parent)
        self.setupUi(self)
-        self.images_changed_signal.connect(self._refreshVersions, QtCore.Qt.QueuedConnection)
+        self.images_changed_signal.connect(self._refreshVersions)
+        self.versions_changed_signal.connect(self._versionRefreshedSlot)

        self._refreshing = False

@@ -139,7 +139,9 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
            if not ComputeManager.instance().vmCompute():
                self.uiVMRadioButton.setEnabled(False)

-            if (ComputeManager.instance().localPlatform().startswith("darwin") or ComputeManager.instance().localPlatform().startswith("win")):
+            if ComputeManager.instance().localPlatform() is None:
+                self.uiLocalRadioButton.setEnabled(False)
+            elif (ComputeManager.instance().localPlatform().startswith("darwin") or ComputeManager.instance().localPlatform().startswith("win")):
                if type == "qemu":
                    # Qemu has issues on OSX and Windows we disallow usage of the local server
                    if not LocalConfig.instance().experimental():
@@ -224,59 +226,68 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):

        self.uiFilesWizardPage.setSubTitle("The following versions are available for " + self._appliance["product_name"] + ".  Check the status of files required to install.")

-        self.uiApplianceVersionTreeWidget.clear()
        worker = WaitForLambdaWorker(lambda: self._refreshDialogWorker())
        progress_dialog = ProgressDialog(worker, "Add appliance", "Scanning directories for files...", None, busy=True, parent=self)
        progress_dialog.show()
-        if progress_dialog.exec_():
-            for version in self._appliance["versions"]:
-                top = QtWidgets.QTreeWidgetItem(self.uiApplianceVersionTreeWidget, ["{} {}".format(self._appliance["product_name"], version["name"])])
-                size = 0
-                status = "Ready to install"
-                for image in version["images"].values():
-                    if image["status"] == "Missing":
-                        status = "Missing files"

-                    size += image.get("filesize", 0)
-                    image_widget = QtWidgets.QTreeWidgetItem(
-                        [
-                            "",
-                            image["filename"],
-                            human_filesize(image.get("filesize", 0)),
-                            image["status"],
-                            image["version"],
-                            image.get("md5sum", "")
-                        ])
-                    if image["status"] == "Missing":
-                        image_widget.setForeground(3, QtGui.QBrush(QtGui.QColor("red")))
-                    else:
-                        image_widget.setForeground(3, QtGui.QBrush(QtGui.QColor("green")))
+    @qslot
+    def _versionRefreshedSlot(self, *args):
+        """
+        Called when we finish to scan the disk for new versions
+        """
+        if self._refreshing or self.currentPage() != self.uiFilesWizardPage:
+            return
+        self._refreshing = True
+        self.uiApplianceVersionTreeWidget.clear()

-                    # Associated data stored are col 0: version, col 1: image
-                    image_widget.setData(0, QtCore.Qt.UserRole, version)
-                    image_widget.setData(1, QtCore.Qt.UserRole, image)
-                    image_widget.setData(2, QtCore.Qt.UserRole, self._appliance)
-                    top.addChild(image_widget)
+        for version in self._appliance["versions"]:
+            top = QtWidgets.QTreeWidgetItem(self.uiApplianceVersionTreeWidget, ["{} {}".format(self._appliance["product_name"], version["name"])])
+            size = 0
+            status = "Ready to install"
+            for image in version["images"].values():
+                if image["status"] == "Missing":
+                    status = "Missing files"

-                font = top.font(0)
-                font.setBold(True)
-                top.setFont(0, font)
-
-                expand = True
-                if status == "Missing files":
-                    top.setForeground(3, QtGui.QBrush(QtGui.QColor("red")))
+                size += image.get("filesize", 0)
+                image_widget = QtWidgets.QTreeWidgetItem(
+                    [
+                        "",
+                        image["filename"],
+                        human_filesize(image.get("filesize", 0)),
+                        image["status"],
+                        image["version"],
+                        image.get("md5sum", "")
+                    ])
+                if image["status"] == "Missing":
+                    image_widget.setForeground(3, QtGui.QBrush(QtGui.QColor("red")))
                else:
-                    expand = False
-                    top.setForeground(3, QtGui.QBrush(QtGui.QColor("green")))
+                    image_widget.setForeground(3, QtGui.QBrush(QtGui.QColor("green")))

-                top.setData(2, QtCore.Qt.DisplayRole, human_filesize(size))
-                top.setData(3, QtCore.Qt.DisplayRole, status)
-                top.setData(2, QtCore.Qt.UserRole, self._appliance)
-                top.setData(0, QtCore.Qt.UserRole, version)
-                self.uiApplianceVersionTreeWidget.addTopLevelItem(top)
-                # self.uiApplianceVersionTreeWidget.setCurrentItem(top)
-                if expand:
-                    top.setExpanded(True)
+                # Associated data stored are col 0: version, col 1: image
+                image_widget.setData(0, QtCore.Qt.UserRole, version)
+                image_widget.setData(1, QtCore.Qt.UserRole, image)
+                image_widget.setData(2, QtCore.Qt.UserRole, self._appliance)
+                top.addChild(image_widget)
+
+            font = top.font(0)
+            font.setBold(True)
+            top.setFont(0, font)
+
+            expand = True
+            if status == "Missing files":
+                top.setForeground(3, QtGui.QBrush(QtGui.QColor("red")))
+            else:
+                expand = False
+                top.setForeground(3, QtGui.QBrush(QtGui.QColor("green")))
+
+            top.setData(2, QtCore.Qt.DisplayRole, human_filesize(size))
+            top.setData(3, QtCore.Qt.DisplayRole, status)
+            top.setData(2, QtCore.Qt.UserRole, self._appliance)
+            top.setData(0, QtCore.Qt.UserRole, version)
+            self.uiApplianceVersionTreeWidget.addTopLevelItem(top)
+            # self.uiApplianceVersionTreeWidget.setCurrentItem(top)
+            if expand:
+                top.setExpanded(True)

        if len(self._appliance["versions"]) > 0:
            self.uiApplianceVersionTreeWidget.resizeColumnToContents(0)
@@ -301,6 +312,8 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
                    image["filesize"] = img.filesize
                else:
                    image["status"] = "Missing"
+        self._refreshing = False
+        self.versions_changed_signal.emit()

    @qslot
    def _applianceVersionCurrentItemChangedSlot(self, current, previous):
@@ -352,7 +365,11 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):

        new_version, ok = QtWidgets.QInputDialog.getText(self, "Creating a new version", "Creating a new version allows to import unknown files to use with this appliance.\nPlease share your experience on the GNS3 community if this version works.\n\nVersion name:", QtWidgets.QLineEdit.Normal)
        if ok:
-            self._appliance.create_new_version(new_version)
+            try:
+                self._appliance.create_new_version(new_version)
+            except ApplianceError as e:
+                QtWidgets.QMessageBox.critical(self.parent(), "Create new version", str(e))
+                return
            self.images_changed_signal.emit()

    @qslot
@@ -365,18 +382,22 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
            return False

        current = self.uiApplianceVersionTreeWidget.currentItem()
+        if not current:
+            return
        disk = current.data(1, QtCore.Qt.UserRole)

        path, _ = QtWidgets.QFileDialog.getOpenFileName()
        if len(path) == 0:
            return

-        image = Image(self._appliance.emulator(), path)
-        if "md5sum" in disk and image.md5sum != disk["md5sum"]:
-            QtWidgets.QMessageBox.warning(self.parent(), "Add appliance", "This is not the correct file. The MD5 sum is {} and should be {}.".format(image.md5sum, disk["md5sum"]))
+        image = Image(self._appliance.emulator(), path, filename=disk["filename"])
+        try:
+            if "md5sum" in disk and image.md5sum != disk["md5sum"]:
+                QtWidgets.QMessageBox.warning(self.parent(), "Add appliance", "This is not the correct file. The MD5 sum is {} and should be {}.".format(image.md5sum, disk["md5sum"]))
+                return
+        except OSError as e:
+            QtWidgets.QMessageBox.warning(self.parent(), "Add appliance", "Can't access to the image file {}: {}.".format(path, str(e)))
            return
-
-        config = Config()
        image.upload(self._compute_id, callback=self._imageUploadedCallback)

    def _getQemuBinariesFromServerCallback(self, result, error=False, **kwargs):
@@ -419,7 +440,11 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
        if version is None:
            appliance_configuration = self._appliance.copy()
        else:
-            appliance_configuration = self._appliance.search_images_for_version(version)
+            try:
+                appliance_configuration = self._appliance.search_images_for_version(version)
+            except ApplianceError as e:
+                QtWidgets.QMessageBox.critical(self.parent(), "Add appliance", str(e))
+                return False

        while len(appliance_configuration["name"]) == 0 or not config.is_name_available(appliance_configuration["name"]):
            QtWidgets.QMessageBox.warning(self.parent(), "Add appliance", "The name \"{}\" is already used by another appliance".format(appliance_configuration["name"]))
@@ -450,7 +475,7 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
        appliance_configuration = self._appliance.search_images_for_version(version)
        for image in appliance_configuration["images"]:
            if image["location"] == "local":
-                image = Image(self._appliance.emulator(), image["path"])
+                image = Image(self._appliance.emulator(), image["path"], filename=image["filename"])
                image.upload(self._compute_id, self._applianceImageUploadedCallback)
                self._image_uploading_count += 1

@@ -480,6 +505,8 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
            if current is None or sip.isdeleted(current):
                return False
            version = current.data(0, QtCore.Qt.UserRole)
+            if version is None:
+                return False
            appliance = current.data(2, QtCore.Qt.UserRole)
            if not self._appliance.is_version_installable(version["name"]):
                QtWidgets.QMessageBox.warning(self, "Appliance", "Sorry, you cannot install {} with missing files".format(appliance["name"]))
@@ -511,11 +538,12 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
            elif hasattr(self, "uiVMRadioButton") and self.uiVMRadioButton.isChecked():
                self._compute_id = "vm"
            else:
-                if (ComputeManager.instance().localPlatform().startswith("darwin") or ComputeManager.instance().localPlatform().startswith("win")):
-                    if "qemu" in self._appliance:
-                        reply = QtWidgets.QMessageBox.question(self, "Appliance", "Qemu on Windows and MacOSX is not supported by the GNS3 team. Are you sur to continue?", QtWidgets.QMessageBox.Yes, QtWidgets.QMessageBox.No)
-                        if reply == QtWidgets.QMessageBox.No:
-                            return False
+                if ComputeManager.instance().localPlatform():
+                    if (ComputeManager.instance().localPlatform().startswith("darwin") or ComputeManager.instance().localPlatform().startswith("win")):
+                        if "qemu" in self._appliance:
+                            reply = QtWidgets.QMessageBox.question(self, "Appliance", "Qemu on Windows and MacOSX is not supported by the GNS3 team. Are you sur to continue?", QtWidgets.QMessageBox.Yes, QtWidgets.QMessageBox.No)
+                            if reply == QtWidgets.QMessageBox.No:
+                                return False

                self._compute_id = "local"

--- a/gns3/dialogs/configuration_dialog.py
+++ b/gns3/dialogs/configuration_dialog.py
@@ -49,6 +49,10 @@ class ConfigurationDialog(QtWidgets.QDialog, Ui_configurationDialog):
        self._settings = settings
        self._configuration_page = configuration_page

+    @property
+    def settings(self):
+        return self._settings
+
    def on_uiButtonBox_clicked(self, button):
        """
        Slot called when a button of the uiButtonBox is clicked.
--- a/gns3/dialogs/console_command_dialog.py
+++ b/gns3/dialogs/console_command_dialog.py
@@ -22,7 +22,6 @@ from gns3.qt import QtWidgets
 from gns3.local_config import LocalConfig
 from gns3.ui.console_command_dialog_ui import Ui_uiConsoleCommandDialog
 from gns3.settings import PRECONFIGURED_TELNET_CONSOLE_COMMANDS, \
-        PRECONFIGURED_SERIAL_CONSOLE_COMMANDS,                   \
        PRECONFIGURED_VNC_CONSOLE_COMMANDS,                      \
        CUSTOM_CONSOLE_COMMANDS_SETTINGS

@@ -63,9 +62,6 @@ class ConsoleCommandDialog(QtWidgets.QDialog, Ui_uiConsoleCommandDialog):
        elif self._console_type == "vnc":
            self._consoles = copy.copy(PRECONFIGURED_VNC_CONSOLE_COMMANDS)
            self._consoles.update(self._settings[self._console_type])
-        else:
-            self._consoles = copy.copy(PRECONFIGURED_SERIAL_CONSOLE_COMMANDS)
-            self._consoles.update(self._settings[self._console_type])

        self.uiCommandComboBox.clear()
        self.uiCommandComboBox.addItem("Custom", "")
--- a/gns3/dialogs/doctor_dialog.py
+++ b/gns3/dialogs/doctor_dialog.py
@@ -138,18 +138,22 @@ class DoctorDialog(QtWidgets.QDialog, Ui_DoctorDialog):

        request_setuid = False
        if sys.platform.startswith("linux"):
-            if "security.capability" in os.listxattr(path):
-                caps = os.getxattr(path, "security.capability")
-                # test the 2nd byte and check if the 13th bit (CAP_NET_RAW) is set
-                if not struct.unpack("<IIIII", caps)[1] & 1 << 13:
-                    return(2, "Ubridge require CAP_NET_RAW. Run sudo setcap cap_net_admin,cap_net_raw=ep {path}".format(path=path))
-            else:
-                # capabilities not supported
-                request_setuid = True
+            try:
+                if "security.capability" in os.listxattr(path):
+                    caps = os.getxattr(path, "security.capability")
+                    # test the 2nd byte and check if the 13th bit (CAP_NET_RAW) is set
+                    if not struct.unpack("<IIIII", caps)[1] & 1 << 13:
+                        return (2, "Ubridge requires CAP_NET_RAW. Run sudo setcap cap_net_admin,cap_net_raw=ep {path}".format(path=path))
+                else:
+                    # capabilities not supported
+                    request_setuid = True
+            except AttributeError:
+                # Due to a Python bug, os.listxattr could be missing: https://github.com/GNS3/gns3-gui/issues/2010
+                return (1, "Could not determine if CAP_NET_RAW capability is set for uBridge (Python bug)".format(path=path))

        if sys.platform.startswith("darwin") or request_setuid:
-             if os.stat(path).st_uid != 0 or not os.stat(path).st_mode & stat.S_ISUID:
-                return (2, "Ubridge should be setuid. Run sudo chown root {path} and sudo chmod 4755 {path}".format(path=path))
+            if os.stat(path).st_uid != 0 or not os.stat(path).st_mode & stat.S_ISUID:
+                return (2, "Ubridge should be setuid. Run sudo chown root:admin {path} and sudo chmod 4750 {path}".format(path=path))
        return (0, None)

    def checkDynamipsPermission(self):
@@ -164,11 +168,15 @@ class DoctorDialog(QtWidgets.QDialog, Ui_DoctorDialog):
        if not os.path.exists(path):
            return (2, "Dynamips path {path} doesn't exists".format(path=path))

-        if sys.platform.startswith("linux") and "security.capability" in os.listxattr(path):
-            caps = os.getxattr(path, "security.capability")
-            # test the 2nd byte and check if the 13th bit (CAP_NET_RAW) is set
-            if not struct.unpack("<IIIII", caps)[1] & 1 << 13:
-                return (2, "Dynamips require CAP_NET_RAW. Run sudo setcap cap_net_raw,cap_net_admin+eip {path}".format(path=path))
+        try:
+            if sys.platform.startswith("linux") and "security.capability" in os.listxattr(path):
+                caps = os.getxattr(path, "security.capability")
+                # test the 2nd byte and check if the 13th bit (CAP_NET_RAW) is set
+                if not struct.unpack("<IIIII", caps)[1] & 1 << 13:
+                    return (2, "Dynamips requires CAP_NET_RAW. Run sudo setcap cap_net_raw,cap_net_admin+eip {path}".format(path=path))
+        except AttributeError:
+            # Due to a Python bug, os.listxattr could be missing: https://github.com/GNS3/gns3-gui/issues/2010
+            return (1, "Could not determine if CAP_NET_RAW capability is set for Dynamips (Python bug)".format(path=path))
        return (0, None)

    def checkGNS3InstalledTwice(self):
@@ -220,5 +228,5 @@ if __name__ == '__main__':
    app = QtWidgets.QApplication(sys.argv)
    main = QtWidgets.QMainWindow()
    dialog = DoctorDialog(main, console=True)
-    #dialog.show()
+    # dialog.show()
    #exit_code = app.exec_()
--- a/gns3/dialogs/edit_compute_dialog.py
+++ b/gns3/dialogs/edit_compute_dialog.py
@@ -89,6 +89,9 @@ class EditComputeDialog(QtWidgets.QDialog, Ui_EditComputeDialog):
        if not re.match(r"^[a-zA-Z0-9\.{}-]+$".format("\u0370-\u1CDF\u2C00-\u30FF\u4E00-\u9FBF"), host):
            QtWidgets.QMessageBox.critical(self, "Remote compute", "Invalid remote server hostname {}".format(host))
            return
+        if name == "gns3vm":
+            QtWidgets.QMessageBox.critical(self, "Remote compute", "{} is a reserved name".format(name))
+            return
        if len(name) == 0:
            QtWidgets.QMessageBox.critical(self, "Remote compute", "Invalid remote server name {}".format(name))
            return
--- a/gns3/dialogs/edit_project_dialog.py
+++ b/gns3/dialogs/edit_project_dialog.py
@@ -15,9 +15,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

-import os
-import re
-
 from ..qt import QtWidgets
 from ..topology import Topology
 from ..ui.edit_project_dialog_ui import Ui_EditProjectDialog
--- a/gns3/dialogs/export_debug_dialog.py
+++ b/gns3/dialogs/export_debug_dialog.py
@@ -25,6 +25,7 @@ from gns3.version import __version__
 from gns3.qt import QtWidgets, QtCore
 from gns3.ui.export_debug_dialog_ui import Ui_ExportDebugDialog
 from gns3.local_config import LocalConfig
+from gns3.controller import Controller

 import logging
 log = logging.getLogger(__name__)
@@ -44,16 +45,27 @@ class ExportDebugDialog(QtWidgets.QDialog, Ui_ExportDebugDialog):
        self.uiOkButton.clicked.connect(self._okButtonClickedSlot)

    def _okButtonClickedSlot(self):
-        path, _ = QtWidgets.QFileDialog.getSaveFileName(self, "Export debug file", None, "Zip file (*.zip)", "Zip file (*.zip)")
-
-        if len(path) == 0:
+        if Controller.instance().isRemote():
+            QtWidgets.QMessageBox.critical(self, "Debug", "Export debug information from a remote server is not supported")
            self.reject()
            return

-        log.info("Export debug information to %s", path)
+        self._path, _ = QtWidgets.QFileDialog.getSaveFileName(self, "Export debug file", None, "Zip file (*.zip)", "Zip file (*.zip)")
+
+        if len(self._path) == 0:
+            self.reject()
+            return
+
+        if Controller.instance().connected():
+            Controller.instance().post("/debug", self._exportDebugCallback)
+        else:
+            self._exportDebugCallback({}, error=True)
+
+    def _exportDebugCallback(self, result, error=False, **kwargs):
+        log.info("Export debug information to %s", self._path)

        try:
-            with ZipFile(path, 'w') as zip:
+            with ZipFile(self._path, 'w') as zip:
                zip.writestr("debug.txt", self._getDebugData())
                dir = LocalConfig.instance().configDirectory()
                for filename in os.listdir(dir):
@@ -61,6 +73,13 @@ class ExportDebugDialog(QtWidgets.QDialog, Ui_ExportDebugDialog):
                    if os.path.isfile(path):
                        zip.write(path, filename)

+                dir = os.path.join(LocalConfig.instance().configDirectory(), "debug")
+                if os.path.exists(dir):
+                    for filename in os.listdir(dir):
+                        path = os.path.join(dir, filename)
+                        if os.path.isfile(path):
+                            zip.write(path, filename)
+
                if self._project:
                    dir = self._project.filesDir()
                    if dir:
--- a/gns3/dialogs/file_editor_dialog.py
+++ b/gns3/dialogs/file_editor_dialog.py
@@ -67,6 +67,6 @@ class FileEditorDialog(QtWidgets.QDialog, Ui_FileEditorDialog):
    def _getCallback(self, result, error=False, raw_body=None, **kwargs):
        if not error:
            self.uiFileTextEdit.setText(raw_body.decode("utf-8"))
-        elif result["status"] == 404:
+        elif result.get("status") == 404:
            if self._default:
                self.uiFileTextEdit.setText(self._default)
--- 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):

--- a/gns3/dialogs/preferences_dialog.py
+++ b/gns3/dialogs/preferences_dialog.py
@@ -27,6 +27,9 @@ from ..pages.packet_capture_preferences_page import PacketCapturePreferencesPage
 from ..pages.gns3_vm_preferences_page import GNS3VMPreferencesPage
 from ..modules import MODULES

+import logging
+log = logging.getLogger(__name__)
+

 class PreferencesDialog(QtWidgets.QDialog, Ui_PreferencesDialog):

@@ -41,6 +44,7 @@ class PreferencesDialog(QtWidgets.QDialog, Ui_PreferencesDialog):
        super().__init__(parent)

        self.setupUi(self)
+        self._modified_pages = set()

        # We adapt the max size to the screen resolution
        # We need to manually do that otherwise on small screen the windows
@@ -102,6 +106,7 @@ class PreferencesDialog(QtWidgets.QDialog, Ui_PreferencesDialog):
            parent = self.uiTreeWidget
            for cls in preference_pages:
                preferences_page = cls()
+                preferences_page.setParent(self)
                preferences_page.loadPreferences()
                name = preferences_page.windowTitle()
                item = QtWidgets.QTreeWidgetItem(parent)
@@ -124,6 +129,7 @@ class PreferencesDialog(QtWidgets.QDialog, Ui_PreferencesDialog):
        # Class name, changed signal
        widget_to_watch = {
            QtWidgets.QLineEdit: "textChanged",
+            QtWidgets.QPlainTextEdit: "textChanged",
            # QtWidgets.QTreeWidget: "itemChanged",
            QtWidgets.QComboBox: "currentIndexChanged",
            QtWidgets.QSpinBox: "valueChanged",
@@ -140,17 +146,23 @@ class PreferencesDialog(QtWidgets.QDialog, Ui_PreferencesDialog):
        """

        # Found the page with the change
-        widget = self.sender()
+        widget = sender = self.sender()
        while widget.parent() != self.uiStackedWidget:
            widget = widget.parent()

-        self.addModifiedPage(widget)
+        if self.addModifiedPage(widget):
+            log.debug("%s value has changed", sender.objectName())

    def addModifiedPage(self, widget):
+        """
+        :returns: True is the page is initialized and element added
+        """
        # The widget can trigger signal before the end of init due to async api call
        if not hasattr(widget, 'pageInitialized') or widget.pageInitialized():
            self._applyButton.setEnabled(True)
            self._modified_pages.add(widget)
+            return True
+        return False

    def _showPreferencesPageSlot(self, current, previous):
        """
@@ -182,7 +194,7 @@ class PreferencesDialog(QtWidgets.QDialog, Ui_PreferencesDialog):
        """

        success = True
-        for preferences_page in self._modified_pages:
+        for preferences_page in list(self._modified_pages):
            ok = preferences_page.savePreferences()
            # if page.savePreferences() returns None, assume success
            if ok is not None and not ok:
--- a/gns3/dialogs/profile_select.py
+++ b/gns3/dialogs/profile_select.py
@@ -17,6 +17,7 @@

 import os
 import sys
+import shutil

 from gns3.qt import QtWidgets
 from gns3.local_config import LocalConfig
@@ -41,6 +42,7 @@ class ProfileSelectDialog(QtWidgets.QDialog, Ui_ProfileSelectDialog):
        self.setupUi(self)

        self.uiNewPushButton.clicked.connect(self._newPushButtonSlot)
+        self.uiDeletePushButton.clicked.connect(self._deletePushButtonSlot)

        # Center on screen
        screen = QtWidgets.QApplication.desktop().screenGeometry()
@@ -52,15 +54,20 @@ class ProfileSelectDialog(QtWidgets.QDialog, Ui_ProfileSelectDialog):
        else:
            home = os.path.expanduser("~")
            path = os.path.join(home, ".config", "GNS3")
-        profiles_path = os.path.join(path, "profiles")
+        self.profiles_path = os.path.join(path, "profiles")

        self.uiShowAtStartupCheckBox.setChecked(LocalConfig.instance().multiProfiles())
+        self._refresh()
+
+    def _refresh(self):
+        self.uiProfileSelectComboBox.clear()
        self.uiProfileSelectComboBox.addItem("default")

        try:
-            if os.path.exists(profiles_path):
-                for profil in sorted(os.listdir(os.path.join(path, "profiles"))):
-                    self.uiProfileSelectComboBox.addItem(profil)
+            if os.path.exists(self.profiles_path):
+                for profil in sorted(os.listdir(self.profiles_path)):
+                    if not profil.startswith("."):
+                        self.uiProfileSelectComboBox.addItem(profil)
        except OSError:
            pass

@@ -78,8 +85,19 @@ class ProfileSelectDialog(QtWidgets.QDialog, Ui_ProfileSelectDialog):
            self.uiProfileSelectComboBox.setCurrentText(profile)
            self.accept()

+    def _deletePushButtonSlot(self):
+        profile = self.uiProfileSelectComboBox.currentText()
+        if profile == "default":
+            QtWidgets.QMessageBox.critical(self.parentWidget(), "Delete profile", "You can't delete the default profile")
+        else:
+            try:
+                shutil.rmtree(os.path.join(self.profiles_path, profile))
+                self._refresh()
+            except (OSError, PermissionError) as e:
+                QtWidgets.QMessageBox.critical(self.parentWidget(), "Delete profile", str(e))
+
+
 if __name__ == '__main__':
-    import sys
    app = QtWidgets.QApplication(sys.argv)
    dialog = ProfileSelectDialog()
    dialog.show()
--- a/gns3/dialogs/project_dialog.py
+++ b/gns3/dialogs/project_dialog.py
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

 import os
-from ..qt import QtCore, QtGui, QtWidgets
+from ..qt import QtCore, QtGui, QtWidgets, qslot
 from ..ui.project_dialog_ui import Ui_ProjectDialog
 from ..controller import Controller
 from ..topology import Topology
@@ -43,7 +43,6 @@ class ProjectDialog(QtWidgets.QDialog, Ui_ProjectDialog):
        self.setupUi(self)

        self._main_window = parent
-        self._projects = []
        self._project_settings = {}
        self.uiNameLineEdit.setText(default_project_name)
        self.uiLocationLineEdit.setText(os.path.join(Topology.instance().projectsDirPath(), default_project_name))
@@ -65,16 +64,14 @@ class ProjectDialog(QtWidgets.QDialog, Ui_ProjectDialog):
            self.uiLocationLineEdit.setVisible(False)
            self.uiLocationBrowserToolButton.setVisible(False)
            self.uiOpenProjectPushButton.setVisible(False)
-        Controller.instance().connected_signal.connect(self._refreshProjects)

        self.uiProjectsTreeWidget.itemDoubleClicked.connect(self._projectsTreeWidgetDoubleClickedSlot)
        self.uiDeleteProjectButton.clicked.connect(self._deleteProjectSlot)
        self.uiDuplicateProjectPushButton.clicked.connect(self._duplicateProjectSlot)
-        self.uiRefreshProjectsPushButton.clicked.connect(self._refreshProjects)
-        self._refreshProjects()
-
-    def _refreshProjects(self):
-        Controller.instance().get("/projects", self._projectListCallback)
+        self.uiRefreshProjectsPushButton.clicked.connect(Controller.instance().refreshProjectList)
+        Controller.instance().project_list_updated_signal.connect(self._updateProjectListSlot)
+        self._updateProjectListSlot()
+        Controller.instance().refreshProjectList()

    def _settingsClickedSlot(self):
        """
@@ -86,7 +83,8 @@ class ProjectDialog(QtWidgets.QDialog, Ui_ProjectDialog):
    def _projectsTreeWidgetDoubleClickedSlot(self, item, column):
        self.done(True)

-    def _deleteProjectSlot(self):
+    @qslot
+    def _deleteProjectSlot(self, *args):
        if len(self.uiProjectsTreeWidget.selectedItems()) == 0:
            QtWidgets.QMessageBox.critical(self, "Delete project", "No project selected")
            return
@@ -105,13 +103,7 @@ class ProjectDialog(QtWidgets.QDialog, Ui_ProjectDialog):
                projects_to_delete.add(project_id)

        for project_id in projects_to_delete:
-            Controller.instance().delete("/projects/{}".format(project_id), self._deleteProjectCallback)
-
-    def _deleteProjectCallback(self, result, error=False, **kwargs):
-        if error:
-            log.error("Error while deleting project: {}".format(result["message"]))
-            return
-        Controller.instance().get("/projects", self._projectListCallback)
+            Controller.instance().deleteProject(project_id)

    def _duplicateProjectSlot(self):
        if len(self.uiProjectsTreeWidget.selectedItems()) == 0:
@@ -127,7 +119,7 @@ class ProjectDialog(QtWidgets.QDialog, Ui_ProjectDialog):
            project_name = project.data(1, QtCore.Qt.UserRole)

            new_project_name = project_name + "-1"
-            existing_project_name = [p["name"] for p in self._projects]
+            existing_project_name = [p["name"] for p in Controller.instance().projects()]
            i = 1
            while new_project_name in existing_project_name:
                new_project_name = "{}-{}".format(project_name, i)
@@ -140,39 +132,46 @@ class ProjectDialog(QtWidgets.QDialog, Ui_ProjectDialog):
                                                         new_project_name)
            name = name.strip()
            if reply and len(name) > 0:
-                Controller.instance().post("/projects/{project_id}/duplicate".format(project_id=project_id), self._duplicateCallback, body={"name": name})
+                if Controller.instance().isRemote():
+                    Controller.instance().post("/projects/{project_id}/duplicate".format(project_id=project_id),
+                                               self._duplicateCallback,
+                                               body={"name": name})
+                else:
+                    project_location = os.path.join(Topology.instance().projectsDirPath(), name)
+                    Controller.instance().post("/projects/{project_id}/duplicate".format(project_id=project_id),
+                                               self._duplicateCallback,
+                                               body={"name": name, "path": project_location})

    def _duplicateCallback(self, result, error=False, **kwargs):
        if error:
            log.error("Error while duplicate project: {}".format(result["message"]))
            return
-        Controller.instance().get("/projects", self._projectListCallback)
+        Controller.instance().refreshProjectList()

-    def _projectListCallback(self, result, error=False, **kwargs):
+    @qslot
+    def _updateProjectListSlot(self, *args):
        self.uiProjectsTreeWidget.clear()
        self.uiDeleteProjectButton.setEnabled(False)
-        if not error:
-            self._projects = result
-            self.uiProjectsTreeWidget.setUpdatesEnabled(False)
-            items = []
-            for project in result:
-                path = os.path.join(project["path"], project["filename"])
-                item = QtWidgets.QTreeWidgetItem([project["name"], project["status"], path])
-                item.setData(0, QtCore.Qt.UserRole, project["project_id"])
-                item.setData(1, QtCore.Qt.UserRole, project["name"])
-                item.setData(2, QtCore.Qt.UserRole, path)
-                items.append(item)
-            self.uiProjectsTreeWidget.addTopLevelItems(items)
+        self.uiProjectsTreeWidget.setUpdatesEnabled(False)
+        items = []
+        for project in Controller.instance().projects():
+            path = os.path.join(project["path"], project["filename"])
+            item = QtWidgets.QTreeWidgetItem([project["name"], project["status"], path])
+            item.setData(0, QtCore.Qt.UserRole, project["project_id"])
+            item.setData(1, QtCore.Qt.UserRole, project["name"])
+            item.setData(2, QtCore.Qt.UserRole, path)
+            items.append(item)
+        self.uiProjectsTreeWidget.addTopLevelItems(items)

-            if len(result):
-                self.uiDeleteProjectButton.setEnabled(True)
+        if len(Controller.instance().projects()):
+            self.uiDeleteProjectButton.setEnabled(True)

-            self.uiProjectsTreeWidget.header().setResizeContentsPrecision(100)  # How many row is checked for the resize for performance reason
-            self.uiProjectsTreeWidget.resizeColumnToContents(0)
-            self.uiProjectsTreeWidget.resizeColumnToContents(1)
-            self.uiProjectsTreeWidget.resizeColumnToContents(2)
-            self.uiProjectsTreeWidget.sortItems(0, QtCore.Qt.AscendingOrder)
-            self.uiProjectsTreeWidget.setUpdatesEnabled(True)
+        self.uiProjectsTreeWidget.header().setResizeContentsPrecision(100)  # How many row is checked for the resize for performance reason
+        self.uiProjectsTreeWidget.resizeColumnToContents(0)
+        self.uiProjectsTreeWidget.resizeColumnToContents(1)
+        self.uiProjectsTreeWidget.resizeColumnToContents(2)
+        self.uiProjectsTreeWidget.sortItems(0, QtCore.Qt.AscendingOrder)
+        self.uiProjectsTreeWidget.setUpdatesEnabled(True)

    def keyPressEvent(self, e):
        """
@@ -229,8 +228,12 @@ class ProjectDialog(QtWidgets.QDialog, Ui_ProjectDialog):

        menu = QtWidgets.QMenu()
        menu.triggered.connect(self._menuTriggeredSlot)
-        for action in self._main_window._recent_project_actions:
-            menu.addAction(action)
+        if Controller.instance().isRemote():
+            for action in self._main_window.recent_project_actions:
+                menu.addAction(action)
+        else:
+            for action in self._main_window.recent_file_actions:
+                menu.addAction(action)
        menu.exec_(QtGui.QCursor.pos())

    def _overwriteProjectCallback(self, result, error=False, **kwargs):
@@ -242,42 +245,50 @@ class ProjectDialog(QtWidgets.QDialog, Ui_ProjectDialog):
                QtWidgets.QMessageBox.critical(self,
                                               "New Project",
                                               "Error while overwrite project: {}".format(result["message"]))
-        self._projects = []
-        self._refreshProjects()
+        Controller.instance().refreshProjectList()
        self.done(True)

    def _newProject(self):
-        project_name = self.uiNameLineEdit.text()
+        self._project_settings["project_name"] = self.uiNameLineEdit.text().strip()
+        if Controller.instance().isRemote():
+            self._project_settings.pop("project_path", None)
+            self._project_settings.pop("project_files_dir", None)
+        else:
+            project_location = self.uiLocationLineEdit.text().strip()
+            if not project_location:
+                QtWidgets.QMessageBox.critical(self, "New project", "Project location is empty")
+                return False

-        if not project_name:
+            self._project_settings["project_path"] = os.path.join(project_location, self._project_settings["project_name"] + ".gns3")
+            self._project_settings["project_files_dir"] = project_location
+
+        if len(self._project_settings["project_name"]) == 0:
            QtWidgets.QMessageBox.critical(self, "New project", "Project name is empty")
            return False

-        for existing_project in self._projects:
-            if project_name == existing_project["name"]:
+        for existing_project in Controller.instance().projects():
+            if self._project_settings["project_name"] == existing_project["name"] \
+               or ("project_files_dir" in self._project_settings and self._project_settings["project_files_dir"] == existing_project["path"]):
+
+                if existing_project["status"] == "opened":
+                    QtWidgets.QMessageBox.critical(self,
+                                                   "New project",
+                                                   "Project {} is open you can not overwrite it".format(self._project_settings["project_name"]))
+                    return False
+
                reply = QtWidgets.QMessageBox.warning(self,
                                                      "New project",
-                                                      "Project {} already exists, overwrite it?".format(project_name),
+                                                      "Project {} already exists, overwrite it?".format(existing_project["name"]),
                                                      QtWidgets.QMessageBox.Yes,
                                                      QtWidgets.QMessageBox.No)

                if reply == QtWidgets.QMessageBox.Yes:
-                    Controller.instance().delete("/projects/{}".format(existing_project["project_id"]), self._overwriteProjectCallback)
+                    Controller.instance().deleteProject(existing_project["project_id"], self._overwriteProjectCallback)

                # In all cases we cancel the new project and if project success to delete
                # we will call done again
                return False

-        self._project_settings["project_name"] = project_name
-
-        if not Controller.instance().isRemote():
-            project_location = self.uiLocationLineEdit.text()
-            if not project_location:
-                QtWidgets.QMessageBox.critical(self, "New project", "Project location is empty")
-                return False
-
-            self._project_settings["project_path"] = os.path.join(project_location, project_name + ".gns3")
-            self._project_settings["project_files_dir"] = project_location
        return True

    def done(self, result):
@@ -294,5 +305,4 @@ class ProjectDialog(QtWidgets.QDialog, Ui_ProjectDialog):

                self._project_settings["project_id"] = current.data(0, QtCore.Qt.UserRole)
                self._project_settings["project_name"] = current.data(1, QtCore.Qt.UserRole)
-                self._project_settings["project_path"] = current.data(2, QtCore.Qt.UserRole)
        super().done(result)
--- a/gns3/dialogs/setup_wizard.py
+++ b/gns3/dialogs/setup_wizard.py
@@ -25,9 +25,11 @@ from gns3.local_server import LocalServer
 from gns3.utils.progress_dialog import ProgressDialog
 from gns3.utils.wait_for_connection_worker import WaitForConnectionWorker

+from ..settings import DEFAULT_LOCAL_SERVER_HOST
 from ..ui.setup_wizard_ui import Ui_SetupWizard
 from ..version import __version__

+
 import logging
 log = logging.getLogger(__name__)

@@ -80,10 +82,8 @@ class SetupWizard(QtWidgets.QWizard, Ui_SetupWizard):
        # load all available addresses
        for address in QtNetwork.QNetworkInterface.allAddresses():
            address_string = address.toString()
-            # if address.protocol() == QtNetwork.QAbstractSocket.IPv6Protocol:
-            # we do not want the scope id when using an IPv6 address...
-            # address.setScopeId("")
-            self.uiLocalServerHostComboBox.addItem(address_string, address.toString())
+            if address.protocol() != QtNetwork.QAbstractSocket.IPv6Protocol:
+                self.uiLocalServerHostComboBox.addItem(address_string, address.toString())

        if sys.platform.startswith("darwin"):
            self.uiVMwareBannerButton.setIcon(QtGui.QIcon(":/images/vmware_fusion_banner.jpg"))
@@ -183,6 +183,7 @@ class SetupWizard(QtWidgets.QWizard, Ui_SetupWizard):

        super().initializePage(page_id)
        if self.page(page_id) == self.uiServerWizardPage:
+            Controller.instance().setDisplayError(False)
            Controller.instance().get("/gns3vm", self._getSettingsCallback)
        elif self.page(page_id) == self.uiVMWizardPage:
            if self._GNS3VMSettings()["engine"] == "vmware":
@@ -204,12 +205,18 @@ class SetupWizard(QtWidgets.QWizard, Ui_SetupWizard):

        elif self.page(page_id) == self.uiRemoteControllerWizardPage:
            local_server_settings = LocalServer.instance().localServerSettings()
-            self.uiRemoteMainServerHostLineEdit.setText(local_server_settings["host"])
+            if local_server_settings["host"] is None:
+                self.uiRemoteMainServerHostLineEdit.setText(DEFAULT_LOCAL_SERVER_HOST)
+                self.uiRemoteMainServerAuthCheckBox.setChecked(False)
+                self.uiRemoteMainServerUserLineEdit.setText("")
+                self.uiRemoteMainServerPasswordLineEdit.setText("")
+            else:
+                self.uiRemoteMainServerHostLineEdit.setText(local_server_settings["host"])
+                self.uiRemoteMainServerAuthCheckBox.setChecked(local_server_settings["auth"])
+                self.uiRemoteMainServerUserLineEdit.setText(local_server_settings["user"])
+                self.uiRemoteMainServerPasswordLineEdit.setText(local_server_settings["password"])
            self.uiRemoteMainServerPortSpinBox.setValue(local_server_settings["port"])
-            self.uiRemoteMainServerUserLineEdit.setText(local_server_settings["user"])
-            self.uiRemoteMainServerPasswordLineEdit.setText(local_server_settings["password"])
            self.uiRemoteMainServerProtocolComboBox.setCurrentText(local_server_settings["protocol"])
-            self.uiRemoteMainServerAuthCheckBox.setChecked(local_server_settings["auth"])
        elif self.page(page_id) == self.uiLocalServerStatusWizardPage:
            self._refreshLocalServerStatusSlot()

@@ -240,12 +247,13 @@ class SetupWizard(QtWidgets.QWizard, Ui_SetupWizard):
        Refresh the local server status page
        """
        if Controller.instance().connected():
-            self.uiLocalServerStatusLabel.setText("Connection to local server successfull")
+            self.uiLocalServerStatusLabel.setText("Connection to local server successful")
+            Controller.instance().get("/gns3vm", self._getSettingsCallback)
        elif Controller.instance().connecting():
            self.uiLocalServerStatusLabel.setText("Please wait connection to the GNS3 server")
        else:
            local_server_settings = LocalServer.instance().localServerSettings()
-            self.uiLocalServerStatusLabel.setText("Connection to local server failed.\n* Make sure GNS3 is authorized in your firewall.\n* Go back and try to change server port\n* Please check in a browser if you can connect to {protocol}://{host}:{port}.\n* If it's not working try to run {path} in a terminal to see if you have an error.".format(protocol=local_server_settings["protocol"], host=local_server_settings["host"], port=local_server_settings["port"], path=local_server_settings["path"]))
+            self.uiLocalServerStatusLabel.setText("Connection to local server failed.\n* Make sure GNS3 is allowed in your firewall.\n* Go back and try to change the server port\n* Please check with a browser if you can connect to {protocol}://{host}:{port}.\n* Try to run {path} in a terminal to see if you have an error if the above does not work.".format(protocol=local_server_settings["protocol"], host=local_server_settings["host"], port=local_server_settings["port"], path=local_server_settings["path"]))

    def _GNS3VMSettings(self):
        return self._gns3_vm_settings
@@ -272,6 +280,7 @@ class SetupWizard(QtWidgets.QWizard, Ui_SetupWizard):
        Validates the settings.
        """

+        Controller.instance().setDisplayError(True)
        if self.currentPage() == self.uiVMWizardPage:
            vmname = self.uiVMListComboBox.currentText()
            if vmname:
@@ -315,6 +324,7 @@ class SetupWizard(QtWidgets.QWizard, Ui_SetupWizard):
                return False

            LocalServer.instance().updateLocalServerSettings(local_server_settings)
+            LocalServer.instance().localServerAutoStartIfRequire()

        elif self.currentPage() == self.uiRemoteControllerWizardPage:
            local_server_settings = LocalServer.instance().localServerSettings()
@@ -334,18 +344,6 @@ class SetupWizard(QtWidgets.QWizard, Ui_SetupWizard):
                vm_settings["enable"] = False
                self._setGNS3VMSettings(vm_settings)

-                # update the modules so they use the local server
-                from gns3.modules import Dynamips
-                Dynamips.instance().setSettings({"use_local_server": True})
-                if sys.platform.startswith("linux"):
-                    # IOU only works on Linux
-                    from gns3.modules import IOU
-                    IOU.instance().setSettings({"use_local_server": True})
-                from gns3.modules import Qemu
-                Qemu.instance().setSettings({"use_local_server": True})
-                from gns3.modules import VPCS
-                VPCS.instance().setSettings({"use_local_server": True})
-
        elif self.currentPage() == self.uiLocalServerStatusWizardPage:
            if not Controller.instance().connected():
                return False
@@ -395,10 +393,15 @@ class SetupWizard(QtWidgets.QWizard, Ui_SetupWizard):
        :param result: ignored
        """

+        Controller.instance().setDisplayError(True)
        settings = self.parentWidget().settings()
        if result:
            settings["hide_setup_wizard"] = True
        else:
+            local_server_settings = LocalServer.instance().localServerSettings()
+            if local_server_settings["host"] is None:
+                local_server_settings["host"] = DEFAULT_LOCAL_SERVER_HOST
+                LocalServer.instance().updateLocalServerSettings(local_server_settings)
            settings["hide_setup_wizard"] = self.uiShowCheckBox.isChecked()

        self.parentWidget().setSettings(settings)
--- a/gns3/dialogs/snapshots_dialog.py
+++ b/gns3/dialogs/snapshots_dialog.py
@@ -19,16 +19,8 @@
 Dialog to manage the snapshots.
 """

-import shutil
-import re
-import time
-import os
-
 from ..qt import QtCore, QtWidgets
-from ..utils.progress_dialog import ProgressDialog
-from ..utils.process_files_worker import ProcessFilesWorker
 from ..ui.snapshots_dialog_ui import Ui_SnapshotsDialog
-from ..node import Node
 from ..controller import Controller

 from datetime import datetime
@@ -64,7 +56,8 @@ class SnapshotsDialog(QtWidgets.QDialog, Ui_SnapshotsDialog):
        """

        self.uiSnapshotsList.clear()
-        Controller.instance().get("/projects/{}/snapshots".format(self._project.id()), self._listSnapshotsCallback)
+        if self._project:
+            Controller.instance().get("/projects/{}/snapshots".format(self._project.id()), self._listSnapshotsCallback)

    def _listSnapshotsCallback(self, result, error=False, server=None, context={}, **kwargs):
        if error:
@@ -91,7 +84,7 @@ class SnapshotsDialog(QtWidgets.QDialog, Ui_SnapshotsDialog):
        """

        snapshot_name, ok = QtWidgets.QInputDialog.getText(self, "Snapshot", "Snapshot name:", QtWidgets.QLineEdit.Normal, "Unnamed")
-        if ok and snapshot_name:
+        if ok and snapshot_name and self._project:
            Controller.instance().post("/projects/{}/snapshots".format(self._project.id()), self._createSnapshotsCallback, {"name": snapshot_name})

    def _createSnapshotsCallback(self, result, error=False, server=None, context={}, **kwargs):
--- a/gns3/dialogs/text_editor_dialog.py
+++ b/gns3/dialogs/text_editor_dialog.py
@@ -19,7 +19,7 @@
 Text editor to edit Note items.
 """

-from ..qt import QtCore, QtWidgets
+from ..qt import QtCore, QtWidgets, qslot
 from ..ui.text_editor_dialog_ui import Ui_TextEditorDialog


@@ -70,16 +70,19 @@ class TextEditorDialog(QtWidgets.QDialog, Ui_TextEditorDialog):
                                                                                 color.blue(),
                                                                                 color.alpha()))

-    def _setFontSlot(self):
+    @qslot
+    def _setFontSlot(self, *args):
        """
        Slot to select the font.
        """

-        selected_font, ok = QtWidgets.QFontDialog.getFont(self.uiPlainTextEdit.font(), self)
+        selected_font, ok = QtWidgets.QFontDialog.getFont(self.uiPlainTextEdit.font(), self,
+                                                          options=QtWidgets.QFontDialog.DontUseNativeDialog)
        if ok:
            self.uiPlainTextEdit.setFont(selected_font)

-    def _setColorSlot(self):
+    @qslot
+    def _setColorSlot(self, *args):
        """
        Slot to select the color.
        """
@@ -88,7 +91,8 @@ class TextEditorDialog(QtWidgets.QDialog, Ui_TextEditorDialog):
        if color.isValid():
            self._setColor(color)

-    def _applyPreferencesSlot(self):
+    @qslot
+    def _applyPreferencesSlot(self, *args):
        """
        Applies the new text settings.
        """
--- a/gns3/dialogs/vm_with_images_wizard.py
+++ b/gns3/dialogs/vm_with_images_wizard.py
@@ -26,18 +26,17 @@ class VMWithImagesWizard(VMWizard):
    Base class for VM wizard with image management (Qemu, IOU...)

    :param devices: List of existing device for this type
-    :param use_local_server: Value the use_local_server settings for this module
    :param parent: parent widget
    """

-    def __init__(self, devices, use_local_server, parent):
+    def __init__(self, devices, parent):
        # The list of images combo box (Qemu support multiple images)
        self._images_combo_boxes = set()

        # The list of radio button for existing image or new images
        self._radio_existing_images_buttons = set()

-        super().__init__(devices, use_local_server, parent)
+        super().__init__(devices, parent)

    def refreshImageStepsButtons(self):
        """
--- a/gns3/dialogs/vm_wizard.py
+++ b/gns3/dialogs/vm_wizard.py
@@ -27,18 +27,17 @@ class VMWizard(QtWidgets.QWizard):
    Base class for VM wizard.

    :param devices: List of existing device for this type
-    :param use_local_server: Value the use_local_server settings for this module
    :param parent: parent widget
    """

-    def __init__(self, devices, use_local_server, parent):
+    def __init__(self, devices, parent):
        super().__init__(parent)
        self.setupUi(self)

        self.setModal(True)

        self._devices = devices
-        self._use_local_server = use_local_server
+        self._local_server_disable = False

        self.setWizardStyle(QtWidgets.QWizard.ModernStyle)
        if sys.platform.startswith("darwin"):
@@ -54,7 +53,7 @@ class VMWizard(QtWidgets.QWizard):
            self.uiLocalRadioButton.setText("Run device on the main server")

        # By default we use the local server
-        self._compute_id = ComputeManager.instance().computes()[0].id()
+        self._compute_id = "local"
        self.uiLocalRadioButton.setChecked(True)
        self._localToggledSlot(True)

@@ -106,13 +105,14 @@ class VMWizard(QtWidgets.QWizard):
            for compute in ComputeManager.instance().computes():
                if compute.id() == "local":
                    self.uiLocalRadioButton.setEnabled(True)
-                elif compute.id() == "vm" and hasattr(self, "uiVMRadioButton"):
-                    self.uiVMRadioButton.setEnabled(True)
+                elif compute.id() == "vm":
+                    if hasattr(self, "uiVMRadioButton"):
+                        self.uiVMRadioButton.setEnabled(True)
                else:
                    self.uiRemoteRadioButton.setEnabled(True)
                    self.uiRemoteServersComboBox.addItem(compute.name(), compute.id())

-            if self._use_local_server and self.uiLocalRadioButton.isEnabled() and self.uiLocalRadioButton.isVisible():
+            if self.uiLocalRadioButton.isEnabled() and not self._local_server_disable:
                self.uiLocalRadioButton.setChecked(True)
            elif hasattr(self, "uiVMRadioButton") and self.uiVMRadioButton.isEnabled():
                self.uiVMRadioButton.setChecked(True)
@@ -126,6 +126,7 @@ class VMWizard(QtWidgets.QWizard):
        """
        Turn off the local server
        """
+        self._local_server_disable = True
        self.uiLocalRadioButton.hide()
        self.uiLocalRadioButton.setEnabled(False)
        self.setStartId(0)
--- a/gns3/graphics_view.py
+++ b/gns3/graphics_view.py
@@ -24,17 +24,15 @@ import os
 import sip
 import pickle

-from .qt import QtCore, QtGui, QtSvg, QtNetwork, QtWidgets, qpartial
+from .qt import QtCore, QtGui, QtNetwork, QtWidgets, qpartial, qslot
 from .items.node_item import NodeItem
 from .dialogs.node_properties_dialog import NodePropertiesDialog
 from .link import Link
 from .node import Node
 from .modules import MODULES
-from .modules.builtin.cloud import Cloud
 from .modules.module_error import ModuleError
 from .settings import GRAPHICS_VIEW_SETTINGS
 from .topology import Topology
-from .ports.port import Port
 from .dialogs.style_editor_dialog import StyleEditorDialog
 from .dialogs.text_editor_dialog import TextEditorDialog
 from .dialogs.symbol_selection_dialog import SymbolSelectionDialog
@@ -44,7 +42,6 @@ from .dialogs.file_editor_dialog import FileEditorDialog
 from .local_config import LocalConfig
 from .progress import Progress
 from .utils.server_select import server_select
-from .utils.normalize_filename import normalize_filename
 from .compute_manager import ComputeManager

 # link items
@@ -280,6 +277,8 @@ class GraphicsView(QtWidgets.QGraphicsView):
        """

        link = self._topology.getLink(link_id)
+        if not link:
+            return
        source_item = None
        destination_item = None
        source_port = link.sourcePort()
@@ -300,41 +299,10 @@ class GraphicsView(QtWidgets.QGraphicsView):
            self.deleteLinkSlot(link_id)
            return

-        # Multi-link management
-        #
-        # multi is the offset of the link
-        # +------+       multi = -1    Link 2  +-------+
-        # |      +-----------------------------+       |
-        # |  R1  |                             |   R2  |
-        # |      |        multi = 0    Link 1  |       |
-        # |      +-----------------------------+       |
-        # |      |        multi = 1    Link 3  |       |
-        # +------+-----------------------------+-------+
-
-        if source_item == destination_item:
-            multi = 0
-        else:
-            multi = 0
-            link_items = source_item.links()
-            for link_item in link_items:
-                if link_item.destinationItem().node().id() == destination_item.node().id():
-                    multi += 1
-                if link_item.sourceItem().node().id() == destination_item.node().id():
-                    multi += 1
-
-        # MAX 7 links on the scene between 2 nodes
-        if multi > 7:
-            multi = 0
-        # Pair item represent the bottom links
-        elif multi % 2 == 0:
-            multi = multi // 2
-        else:
-            multi = -multi // 2
-
        if link.sourcePort().linkType() == "Serial":
-            link_item = SerialLinkItem(source_item, source_port, destination_item, destination_port, link, multilink=multi)
+            link_item = SerialLinkItem(source_item, source_port, destination_item, destination_port, link)
        else:
-            link_item = EthernetLinkItem(source_item, source_port, destination_item, destination_port, link, multilink=multi)
+            link_item = EthernetLinkItem(source_item, source_port, destination_item, destination_port, link)
        self.scene().addItem(link_item)

    def deleteLinkSlot(self, link_id):
@@ -362,6 +330,11 @@ class GraphicsView(QtWidgets.QGraphicsView):
            source_port = source_item.connectToPort()
            if not source_port:
                return
+
+            if source_port.link() is not None:
+                QtWidgets.QMessageBox.warning(self, "Create link", "Can't create the link the port is not free")
+                return
+
            if source_port.linkType() == "Serial":
                self._newlink = SerialLinkItem(source_item, source_port, self.mapToScene(event.pos()), None, adding_flag=True)
            else:
@@ -375,6 +348,10 @@ class GraphicsView(QtWidgets.QGraphicsView):
            if not destination_port:
                return

+            if destination_port.link() is not None:
+                QtWidgets.QMessageBox.warning(self, "Create link", "Can't create the link the destination port is not free")
+                return
+
            if self._newlink in self.scene().items():
                self.scene().removeItem(self._newlink)
            self._newlink = None
@@ -414,7 +391,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
            else:
                item.setSelected(True)
        elif is_not_link and event.button() == QtCore.Qt.RightButton and not self._adding_link:
-            if item:
+            if item and not sip.isdeleted(item):
                # Prevent right clicking on a selected item from de-selecting all other items
                if not item.isSelected():
                    if not event.modifiers() & QtCore.Qt.ControlModifier:
@@ -424,7 +401,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
                        item.setFlag(item.ItemIsSelectable, True)
                    item.setSelected(True)
                    self._showDeviceContextualMenu(QtGui.QCursor.pos())
-                    if item.zValue() < 0:
+                    if not sip.isdeleted(item) and item.zValue() < 0:
                        item.setFlag(item.ItemIsSelectable, False)

                else:
@@ -440,7 +417,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
            self._userNodeLinking(event, item)
        elif event.button() == QtCore.Qt.LeftButton and self._adding_note:
            pos = self.mapToScene(event.pos())
-            note = self.createDrawingItem("text", pos.x(), pos.y(), 0)
+            note = self.createDrawingItem("text", pos.x(), pos.y(), 1)
            pos_x = note.pos().x()
            pos_y = note.pos().y() - (note.boundingRect().height() / 2)
            note.setPos(pos_x, pos_y)
@@ -573,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:
@@ -652,7 +629,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
                QtWidgets.QMessageBox.critical(self, "Project files", "Please drop only one file")
                return
            path = event.mimeData().urls()[0].toLocalFile()
-            if os.path.isfile(path) and self._main_window.checkForUnsavedChanges():
+            if os.path.isfile(path):
                self._main_window.loadPath(path)
            event.acceptProposedAction()
        else:
@@ -895,7 +872,7 @@ class GraphicsView(QtWidgets.QGraphicsView):

        items = []
        for item in self.scene().selectedItems():
-            if isinstance(item, NodeItem) and item.node().initialized():
+            if isinstance(item, NodeItem) and item.node().initialized() and hasattr(item.node(), "configPage"):
                items.append(item)

        if items:
@@ -947,12 +924,14 @@ class GraphicsView(QtWidgets.QGraphicsView):
                    break

                if os.path.exists(node_dir):
-                    log.debug("Open %s in file manage")
+                    log.debug("Open %s in file manager")
                    if QtGui.QDesktopServices.openUrl(QtCore.QUrl.fromLocalFile(node_dir)) is False:
                        QtWidgets.QMessageBox.critical(self, "Show in file manager", "Failed to open {}".format(node_dir))
                        break
                else:
-                    QtWidgets.QMessageBox.information(self, "Show in file manager", "The device directory is located in {} on {}".format(node_dir, node.compute().name()))
+                    reply = QtWidgets.QMessageBox.information(self, "Show in file manager", "The device directory is located in {} on {}\n\nCopy path to clipboard?".format(node_dir, node.compute().name()), QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No)
+                    if reply == QtWidgets.QMessageBox.Yes:
+                        QtWidgets.QApplication.clipboard().setText(node_dir)
                    break

    def consoleToNode(self, node, aux=False):
@@ -988,12 +967,15 @@ class GraphicsView(QtWidgets.QGraphicsView):
        """

        nodes = {}
+        node_initialized = False
        for item in items:
-            if isinstance(item, NodeItem) and hasattr(item.node(), "console") and item.node().initialized() and item.node().status() == Node.started:
-                node = item.node()
-                nodes[node.name()] = node
+            if isinstance(item, NodeItem) and hasattr(item.node(), "console") and item.node().initialized():
+                node_initialized = True
+                if item.node().status() == Node.started:
+                    node = item.node()
+                    nodes[node.name()] = node

-        if not nodes:
+        if not nodes and node_initialized:
            if len(items) > 1:
                QtWidgets.QMessageBox.warning(self, "Console", "At least one node must be started before a console can be opened")
            else:
@@ -1049,12 +1031,15 @@ class GraphicsView(QtWidgets.QGraphicsView):
        """

        nodes = {}
+        node_initialized = False
        for item in items:
-            if isinstance(item, NodeItem) and hasattr(item.node(), "auxConsole") and item.node().initialized() and item.node().status() == Node.started:
-                node = item.node()
-                nodes[node.name()] = node
+            if isinstance(item, NodeItem) and hasattr(item.node(), "auxConsole") and item.node().initialized():
+                node_initialized = True
+                if item.node().status() == Node.started:
+                    node = item.node()
+                    nodes[node.name()] = node

-        if not nodes:
+        if not nodes and node_initialized:
            if len(items) > 1:
                QtWidgets.QMessageBox.warning(self, "Console", "At least one node must be started before a console can be opened")
            else:
@@ -1334,7 +1319,9 @@ class GraphicsView(QtWidgets.QGraphicsView):
            if item.parentItem() is None:
                if horizontal_pos is None:
                    horizontal_pos = item.y() + item.boundingRect().height() / 2
-                item.setPos(item.x(), horizontal_pos - item.boundingRect().height() / 2)
+                item.setX(item.x())
+                item.setY(horizontal_pos - item.boundingRect().height() / 2)
+                item.updateNode()

    def verticalAlignmentSlot(self):
        """
@@ -1347,7 +1334,9 @@ class GraphicsView(QtWidgets.QGraphicsView):
            if item.parentItem() is None:
                if vertical_position is None:
                    vertical_position = item.x() + item.boundingRect().width() / 2
-                item.setPos(vertical_position - item.boundingRect().width() / 2, item.y())
+                item.setX(vertical_position - item.boundingRect().width() / 2)
+                item.setY(item.y())
+                item.updateNode()

    def raiseLayerActionSlot(self):
        """
@@ -1359,6 +1348,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
            if item.parentItem() is None:
                current_zvalue = item.zValue()
                item.setZValue(current_zvalue + 1)
+                item.updateNode()
                item.update()

    def lowerLayerActionSlot(self):
@@ -1371,6 +1361,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
            if item.parentItem() is None:
                current_zvalue = item.zValue()
                item.setZValue(current_zvalue - 1)
+                item.updateNode()
                item.update()

                if item.zValue() == -1:
@@ -1412,13 +1403,12 @@ class GraphicsView(QtWidgets.QGraphicsView):
        mainwindow = MainWindow.instance()

        if "server" in node_data:
-            return ComputeManager.instance().getCompute(node_data["server"])
+            try:
+                return ComputeManager.instance().getCompute(node_data["server"])
+            except KeyError:
+                raise ModuleError("Compute {} doesn't exists".format(node_data["server"]))

-        if "builtin" in node_data:
-            allow_local_server = True
-        else:
-            allow_local_server = module_instance.settings()["use_local_server"]
-        server = server_select(mainwindow, node_data.get("node_type"), allow_local_server=allow_local_server)
+        server = server_select(mainwindow, node_data.get("node_type"))
        if server is None:
            raise ModuleError("Please select a server")
        return server
@@ -1443,7 +1433,8 @@ class GraphicsView(QtWidgets.QGraphicsView):

            if not node_module:
                raise ModuleError("Could not find any module for {}".format(node_class))
-
+            if self._topology.project() is None:
+                return
            node = node_module.instantiateNode(node_class, self.allocateCompute(node_data, instance), self._topology.project())
        # If no server is available a ValueError is raised
        except (ModuleError, ValueError) as e:
@@ -1453,7 +1444,11 @@ class GraphicsView(QtWidgets.QGraphicsView):
        pos = self.mapToScene(pos)
        node_item = self.createNodeItem(node, node_data["symbol"], pos.x(), pos.y())
        node.setGraphics(node_item)
-        node_module.createNode(node, node_data["name"])
+        try:
+            node_module.createNode(node, node_data["name"])
+        except ModuleError as e:
+            QtWidgets.QMessageBox.critical(self, "Node creation", "{}".format(e))
+            return
        return node_item

    def createNodeItem(self, node, symbol, x, y):
@@ -1463,15 +1458,13 @@ class GraphicsView(QtWidgets.QGraphicsView):
        self.scene().addItem(node_item)
        self._topology.addNode(node)

-        node.error_signal.connect(self._main_window.uiConsoleTextEdit.writeError)
        node.error_signal.connect(self._displayNodeErrorSlot)
-        node.warning_signal.connect(self._main_window.uiConsoleTextEdit.writeWarning)
-        node.server_error_signal.connect(self._main_window.uiConsoleTextEdit.writeServerError)
        node.server_error_signal.connect(self._displayNodeErrorSlot)

        return node_item

-    def _displayNodeErrorSlot(self, node_id, message):
+    @qslot
+    def _displayNodeErrorSlot(self, node_id, message, *args):
        """
        Show error send by a node to the user
        """
@@ -1480,7 +1473,8 @@ class GraphicsView(QtWidgets.QGraphicsView):
        if node:
            if node.name():
                name = node.name()
-        QtWidgets.QMessageBox.critical(self._main_window, name, message.strip())
+        if self._main_window and not sip.isdeleted(self._main_window):
+            QtWidgets.QMessageBox.critical(self._main_window, name, message.strip())

    def createDrawingItem(self, type, x, y, z, rotation=0, svg=None, drawing_id=None):

--- a/gns3/http_client.py
+++ b/gns3/http_client.py
@@ -15,18 +15,19 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

-
+import sip
 import json
 import copy
-import ipaddress
 import http
 import uuid
 import pathlib
-import urllib.request
 import base64
+import datetime
+import ipaddress
+import urllib.request

 from .version import __version__, __version_info__
-from .qt import QtCore, QtNetwork, qpartial
+from .qt import QtCore, QtNetwork, qpartial, sip_is_deleted
 from .utils import parse_version

 import logging
@@ -55,6 +56,7 @@ class HTTPClient(QtCore.QObject):
    _progress_callback = None

    connection_connected_signal = QtCore.Signal()
+    connection_disconnected_signal = QtCore.Signal()

    def __init__(self, settings, network_manager=None):

@@ -62,10 +64,13 @@ class HTTPClient(QtCore.QObject):

        self._protocol = settings.get("protocol", "http")
        self._host = settings["host"]
-        if self._host == "0.0.0.0":
-            self._host = "127.0.0.1"
-        elif ":" in self._host and str(ipaddress.IPv6Address(self._host)) == "::":
-            self._host = "::1"
+        try:
+            if self._host is None or self._host == "0.0.0.0":
+                self._host = "127.0.0.1"
+            elif ":" in self._host and ipaddress.IPv6Address(self._host) and str(ipaddress.IPv6Address(self._host)) == "::":
+                self._host = "::1"
+        except ipaddress.AddressValueError:
+            log.error("Invalid host name %s", self._host)
        self._port = int(settings["port"])
        self._user = settings.get("user", None)
        self._password = settings.get("password", None)
@@ -75,17 +80,24 @@ class HTTPClient(QtCore.QObject):
        self._shutdown = False  # Shutdown in progress
        self._accept_insecure_certificate = settings.get("accept_insecure_certificate", None)

+        # In order to detect computer hibernation we detect the date of the last
+        # query and disconnect if time is too long between two query
+        self._last_query_timestamp = None
+        self._max_time_difference_between_queries = None
+
        if network_manager:
            self._network_manager = network_manager
        else:
            self._network_manager = QtNetwork.QNetworkAccessManager()
-
        # A buffer used by progress download
        self._buffer = {}

        # List of query waiting for the connection
        self._query_waiting_connections = []

+    def setMaxTimeDifferenceBetweenQueries(self, value):
+        self._max_time_difference_between_queries = value
+
    def host(self):
        """
        Host display to user
@@ -159,7 +171,7 @@ class HTTPClient(QtCore.QObject):
        """
        Called when a query start
        """
-        if HTTPClient._progress_callback:
+        if not sip_is_deleted(HTTPClient._progress_callback):
            if progress_text:
                HTTPClient._progress_callback.add_query_signal.emit(query_id, progress_text, response)
            else:
@@ -170,22 +182,24 @@ class HTTPClient(QtCore.QObject):
        Called when a query is over
        """

-        if HTTPClient._progress_callback:
+        if not sip_is_deleted(HTTPClient._progress_callback):
            HTTPClient._progress_callback.remove_query_signal.emit(query_id)

    def _notify_progress_upload(self, query_id, sent, total):
        """
        Called when a query upload progress
        """
-        if HTTPClient._progress_callback:
+        if not sip_is_deleted(HTTPClient._progress_callback):
            HTTPClient._progress_callback.progress_signal.emit(query_id, sent, total)

    def _notify_progress_download(self, query_id, sent, total):
        """
        Called when a query download progress
        """
-        if HTTPClient._progress_callback:
-            HTTPClient._progress_callback.progress_signal.emit(query_id, sent, total)
+        if not sip_is_deleted(HTTPClient._progress_callback):
+            # abs() for maxium because sometimes the system send negative
+            # values
+            HTTPClient._progress_callback.progress_signal.emit(query_id, sent, abs(total))

    @classmethod
    def setProgressCallback(cls, progress_callback):
@@ -208,6 +222,7 @@ class HTTPClient(QtCore.QObject):
        Closes the connection with the server.
        """
        self._connected = False
+        self._progress_callback.reset()

    def _request(self, url):
        """
@@ -228,7 +243,17 @@ class HTTPClient(QtCore.QObject):
        :param query: The Server to connect
        """

-    def createHTTPQuery(self, method, path, callback, body={}, context={}, downloadProgressCallback=None, showProgress=True, ignoreErrors=False, progressText=None, timeout=120, server=None, prefix="/v2", params={}, **kwargs):
+    def createHTTPQuery(self, method, path, callback, body={}, context={},
+                        downloadProgressCallback=None,
+                        showProgress=True,
+                        ignoreErrors=False,
+                        progressText=None,
+                        timeout=120,
+                        server=None,
+                        prefix="/v2",
+                        params={},
+                        networkManager=None,
+                        **kwargs):
        """
        Call the remote server, if not connected, check connection before

@@ -244,15 +269,39 @@ class HTTPClient(QtCore.QObject):
        :param server: The server where the query will run
        :param timeout: Delay in seconds before raising a timeout
        :param prefix: Prefix to the path
+        :param networkManager: QNetworkAccessManager None use the default
        :param params: Query arguments parameters
        :returns: QNetworkReply
        """

+        if "dev" in __version__:
+            assert QtCore.QThread.currentThread() == self.thread(), "HTTP request not started from the main thread"
+
        # Shutdown in progress do not execute the query
        if self._shutdown:
            return

-        request = qpartial(self._executeHTTPQuery, method, path, qpartial(callback), body, context, downloadProgressCallback=downloadProgressCallback, showProgress=showProgress, ignoreErrors=ignoreErrors, progressText=progressText, server=server, timeout=timeout, prefix=prefix, params=params)
+        # We try to detect computer hibernation
+        # if time between two query is too long we trigger a disconnect
+        if self._max_time_difference_between_queries:
+            now = datetime.datetime.now().timestamp()
+            if self._last_query_timestamp is not None and now > self._last_query_timestamp + self._max_time_difference_between_queries:
+                log.warning("Synchronisation lost with the server.")
+                self.disconnect()
+                self._last_query_timestamp = None
+                return
+            self._last_query_timestamp = now
+
+        request = qpartial(self._executeHTTPQuery, method, path, qpartial(callback), body, context,
+                           downloadProgressCallback=downloadProgressCallback,
+                           showProgress=showProgress,
+                           ignoreErrors=ignoreErrors,
+                           progressText=progressText,
+                           networkManager=networkManager,
+                           server=server,
+                           timeout=timeout,
+                           prefix=prefix,
+                           params=params)

        if self._connected:
            return request()
@@ -261,7 +310,7 @@ class HTTPClient(QtCore.QObject):
            # If we are not connected and we enqueue the first query we open the conection
            if len(self._query_waiting_connections) == 1:
                log.info("Connection to {}".format(self.url()))
-                self._executeHTTPQuery("GET", "/version", self._callbackConnect, {}, server=server, timeout=5)
+                self._executeHTTPQuery("GET", "/version", self._callbackConnect, {}, server=server, timeout=5, showProgress=False)

    def _connectionError(self, callback, msg="", server=None):
        """
@@ -318,7 +367,7 @@ class HTTPClient(QtCore.QObject):
            self._query_waiting_connections = []
            return

-        if params["version"] != __version__:
+        if params["version"].split("-")[0] != __version__.split("-")[0]:
            msg = "Client version {} differs with server version {}".format(__version__, params["version"])
            log.error(msg)
            # Stable release
@@ -392,7 +441,7 @@ class HTTPClient(QtCore.QObject):
            request.setRawHeader(b"Authorization", auth_string.encode())
        return request

-    def _executeHTTPQuery(self, method, path, callback, body, context={}, downloadProgressCallback=None, showProgress=True, ignoreErrors=False, progressText=None, server=None, timeout=120, prefix="/v2", params={}, **kwargs):
+    def _executeHTTPQuery(self, method, path, callback, body, context={}, downloadProgressCallback=None, showProgress=True, ignoreErrors=False, progressText=None, server=None, timeout=120, prefix="/v2", params={}, networkManager=None, **kwargs):
        """
        Call the remote server

@@ -403,6 +452,7 @@ class HTTPClient(QtCore.QObject):
        :param context: Pass a context to the response callback
        :param downloadProgressCallback: Callback called when received something, it can be an incomplete response
        :param showProgress: Display progress to the user
+        :param networkManager: The network manager to use. If None use default
        :param progressText: Text display to user in progress dialog. None for auto generated
        :param ignoreErrors: Ignore connection error (usefull to not closing a connection when notification feed is broken)
        :param server: The server where the query is executed
@@ -411,10 +461,6 @@ class HTTPClient(QtCore.QObject):
        :returns: QNetworkReply
        """

-        # TODO: remove it when all call are migrated
-        if "compute/" in path:
-            log.warning("Legacy compute direct call %s", path)
-
        try:
            ip = self._host.rsplit('%', 1)[0]
            ipaddress.IPv6Address(ip)  # remove any scope ID
@@ -442,17 +488,21 @@ class HTTPClient(QtCore.QObject):
        # By default QT doesn't support GET with body even if it's in the RFC that's why we need to use sendCustomRequest
        body = self._addBodyToRequest(body, request)

-        response = self._network_manager.sendCustomRequest(request, method.encode(), body)
+        if not networkManager:
+            networkManager = self._network_manager
+
+        response = networkManager.sendCustomRequest(request, method.encode(), body)

        context = copy.copy(context)
        context["query_id"] = str(uuid.uuid4())

        response.finished.connect(qpartial(self._processResponse, response, server, callback, context, body, ignoreErrors))
+        response.error.connect(qpartial(self._processError, response, server, callback, context, body, ignoreErrors))

        if downloadProgressCallback is not None:
            response.readyRead.connect(qpartial(self._readyReadySlot, response, downloadProgressCallback, context, server))

-        if HTTPClient._progress_callback and HTTPClient._progress_callback.progress_dialog():
+        if not sip_is_deleted(HTTPClient._progress_callback) and HTTPClient._progress_callback.progress_dialog():
            request_canceled = qpartial(self._requestCanceled, response, context)
            HTTPClient._progress_callback.progress_dialog().canceled.connect(request_canceled)

@@ -504,40 +554,43 @@ class HTTPClient(QtCore.QObject):
        Beware it's call for all request you need to check the status of the response
        """
        # We check if we received HTTP headers
-        if not len(response.rawHeaderList()) > 0:
-            response.abort()
+        if not sip.isdeleted(response) and response.isRunning() and not len(response.rawHeaderList()) > 0:
+            if not response.error() != QtNetwork.QNetworkReply.NoError:
+                log.warn("Timeout request {}".format(response.url().toString()))
+                response.abort()
+
+    def disconnect(self):
+        """
+        Disconnect from the remote server
+        """
+        self.connection_disconnected_signal.emit()
+        self.close()

    def _requestCanceled(self, response, context):

-        if response.isRunning():
-            log.warn("Aborting request for {}".format(response.url()))
+        if response.isRunning() and not response.error() != QtNetwork.QNetworkReply.NoError:
+            log.warn("Aborting request for {}".format(response.url().toString()))
            response.abort()
        if "query_id" in context:
            self._notify_progress_end_query(context["query_id"])

-    def _processResponse(self, response, server, callback, context, request_body, ignore_errors):
-
-        if request_body is not None:
-            request_body.close()
-
-        status = None
-        body = None
-
-        if "query_id" in context:
-            self._notify_progress_end_query(context["query_id"])
-
-        if response.error() != QtNetwork.QNetworkReply.NoError:
-            error_code = response.error()
+    def _processError(self, response, server, callback, context, request_body, ignore_errors, error_code):
+        if error_code != QtNetwork.QNetworkReply.NoError:
            error_message = response.errorString()

            if not ignore_errors:
-                log.debug("Response error: %s (error: %d)", error_message, error_code)
+                log.debug("Response error: %s for %s (error: %d)", error_message, response.url().toString(), error_code)

-            if error_code < 200:
-                if not ignore_errors:
-                    self.close()
-                    if callback is not None:
-                        callback({"message": error_message}, error=True, server=server, context=context)
+            if "query_id" in context:
+                self._notify_progress_end_query(context["query_id"])
+
+            if error_code < 200 or error_code == 403:
+                if error_code == QtNetwork.QNetworkReply.OperationCanceledError:  # It's legit to cancel do not disconnect
+                    error_message = "Operation timeout"  # It's more clear than cancel, because cancel is trigger by us when we timeout
+                elif not ignore_errors:
+                    self.disconnect()
+                if callback is not None:
+                    callback({"message": error_message}, error=True, server=server, context=context)
                return
            else:
                status = response.attribute(QtNetwork.QNetworkRequest.HttpStatusCodeAttribute)
@@ -566,7 +619,15 @@ class HTTPClient(QtCore.QObject):
                    log.error(json.loads(body)["message"])
                except (ValueError, KeyError):
                    log.error(error_message)
-        else:
+
+    def _processResponse(self, response, server, callback, context, request_body, ignore_errors):
+        if request_body is not None:
+            request_body.close()
+
+        if "query_id" in context:
+            self._notify_progress_end_query(context["query_id"])
+
+        if response.error() == QtNetwork.QNetworkReply.NoError:
            status = response.attribute(QtNetwork.QNetworkRequest.HttpStatusCodeAttribute)
            log.debug("Decoding response from {} response {}".format(response.url().toString(), status))
            try:
@@ -586,16 +647,15 @@ class HTTPClient(QtCore.QObject):
                    callback(params, error=True, server=server, context=context)
                else:
                    callback(params, server=server, context=context, raw_body=raw_body)
-        # response.deleteLater()
-        if status == 400:
-            try:
-                params = json.loads(body)
-                e = HttpBadRequest(body)
-                e.fingerprint = params["path"]
-            # If something goes wrong for a any reason just raise the bad request
-            except Exception:
-                e = HttpBadRequest(body)
-            raise e
+            if status == 400:
+                try:
+                    params = json.loads(body)
+                    e = HttpBadRequest(body)
+                    e.fingerprint = params["path"]
+                # If something goes wrong for a any reason just raise the bad request
+                except Exception:
+                    e = HttpBadRequest(body)
+                raise e

    def getSynchronous(self, endpoint, timeout=2):
        """
--- a/gns3/image_manager.py
+++ b/gns3/image_manager.py
@@ -18,7 +18,6 @@
 import os
 import copy
 import pathlib
-import glob

 from gns3.qt import QtWidgets
 from gns3.local_server_config import LocalServerConfig
@@ -46,7 +45,7 @@ class ImageManager:
        :returns path: Final path
        """

-        if server and server != "local":
+        if (server and server != "local") or Controller.instance().isRemote():
            return self._uploadImageToRemoteServer(path, server, node_type)
        else:
            destination_directory = self.getDirectoryForType(node_type)
@@ -97,7 +96,7 @@ class ImageManager:

        filename = self._getRelativeImagePath(path, node_type).replace("\\", "/")

-        Controller.instance().postCompute('{}/{}'.format(upload_endpoint, filename), server.id(), None, body=pathlib.Path(path), progressText="Uploading {}".format(filename), timeout=None)
+        Controller.instance().postCompute('{}/{}'.format(upload_endpoint, filename), server, None, body=pathlib.Path(path), progressText="Uploading {}".format(filename), timeout=None)
        return filename

    def _askForUploadMissingImage(self, filename, server):
--- a/gns3/items/drawing_item.py
+++ b/gns3/items/drawing_item.py
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

-from ..qt import QtCore, QtGui, QtWidgets, QtSvg
+from ..qt import QtCore, QtWidgets, qslot

 import uuid
 import logging
@@ -58,7 +58,8 @@ class DrawingItem:
        return self._id

    def create(self):
-        self._project.post("/drawings", self._createDrawingCallback, body=self.__json__())
+        if self._project:
+            self._project.post("/drawings", self._createDrawingCallback, body=self.__json__())

    def _createDrawingCallback(self, result, error=False, **kwargs):
        """
@@ -79,6 +80,7 @@ class DrawingItem:
        if self._id:
            self._project.put("/drawings/" + self._id, self.updateDrawingCallback, body=self.__json__())

+    @qslot
    def updateDrawingCallback(self, result, error=False, **kwargs):
        """
        Callback for update.
@@ -188,6 +190,9 @@ class DrawingItem:
                self.updateDrawing()
        return QtWidgets.QGraphicsItem.itemChange(self, change, value)

+    def updateNode(self):
+        self.updateDrawing()
+
    def drawLayerInfo(self, painter):
        """
        Draws the layer position.
--- a/gns3/items/ethernet_link_item.py
+++ b/gns3/items/ethernet_link_item.py
@@ -36,12 +36,11 @@ class EthernetLinkItem(LinkItem):
    :param destination_port: destination Port instance
    :param link: Link instance (contains back-end stuff for this link)
    :param adding_flag: indicates if this link is being added (no destination yet)
-    :param multilink: used to draw multiple link between the same source and destination
    """

-    def __init__(self, source_item, source_port, destination_item, destination_port, link=None, adding_flag=False, multilink=0):
+    def __init__(self, source_item, source_port, destination_item, destination_port, link=None, adding_flag=False):

-        super().__init__(source_item, source_port, destination_item, destination_port, link, adding_flag, multilink)
+        super().__init__(source_item, source_port, destination_item, destination_port, link, adding_flag)
        self._source_collision_offset = 0.0
        self._destination_collision_offset = 0.0

@@ -143,8 +142,7 @@ class EthernetLinkItem(LinkItem):

            if source_port_label is None:
                source_port_label = NoteItem(self._source_item)
-                source_port_name = self._source_port.name()
-                source_port_label.setPlainText(source_port_name)
+                source_port_label.setPlainText(self._source_port.shortName())
                source_port_label.setPos(self.mapToItem(self._source_item, point1))
                self._source_port.setLabel(source_port_label)

@@ -185,8 +183,7 @@ class EthernetLinkItem(LinkItem):

            if destination_port_label is None:
                destination_port_label = NoteItem(self._destination_item)
-                destination_port_name = self._destination_port.name()
-                destination_port_label.setPlainText(destination_port_name)
+                destination_port_label.setPlainText(self._destination_port.shortName())
                destination_port_label.setPos(self.mapToItem(self._destination_item, point2))
                self._destination_port.setLabel(destination_port_label)

--- a/gns3/items/image_item.py
+++ b/gns3/items/image_item.py
@@ -19,9 +19,7 @@
 Graphical representation of an image on the QGraphicsScene.
 """

-import xml.etree.ElementTree as ET
-
-from ..qt import QtWidgets, QtCore, QtSvg
+from ..qt import QtSvg
 from ..qt.qimage_svg_renderer import QImageSvgRenderer
 from .drawing_item import DrawingItem

@@ -32,8 +30,7 @@ class ImageItem(QtSvg.QGraphicsSvgItem, DrawingItem):
    Class to insert an image on the scene.
    """

-
-    def __init__(self, image_path=None, pos=None,  svg=None, **kws):
+    def __init__(self, image_path=None, pos=None, svg=None, **kws):

        self._image_path = image_path
        # Because we call the Qt C++ code we need to handle the case of pos is None otherwise we will get a conversion error
@@ -42,7 +39,6 @@ class ImageItem(QtSvg.QGraphicsSvgItem, DrawingItem):
        else:
            super().__init__(**kws)

-
        if self._image_path:
            renderer = QImageSvgRenderer(image_path)
            self.setSharedRenderer(renderer)
@@ -77,4 +73,3 @@ class ImageItem(QtSvg.QGraphicsSvgItem, DrawingItem):
        Return an SVG version of the shape
        """
        return self.renderer().svg()
-
--- a/gns3/items/link_item.py
+++ b/gns3/items/link_item.py
@@ -21,9 +21,8 @@ Link items are graphical representation of a link on the QGraphicsScene
 """

 import math
-from ..qt import QtCore, QtGui, QtWidgets, QtSvg
+from ..qt import QtCore, QtGui, QtWidgets, QtSvg, qslot

-from ..node import Node
 from ..packet_capture import PacketCapture


@@ -50,12 +49,12 @@ class LinkItem(QtWidgets.QGraphicsPathItem):
    :param destination_port: destination Port instance
    :param link: Link instance (contains back-end stuff for this link)
    :param adding_flag: indicates if this link is being added (no destination yet)
-    :param multilink: used to draw multiple link between the same source and destination
    """

    _draw_port_labels = False
+    delete_link_item_signal = QtCore.pyqtSignal(str)

-    def __init__(self, source_item, source_port, destination_item, destination_port, link=None, adding_flag=False, multilink=0):
+    def __init__(self, source_item, source_port, destination_item, destination_port, link=None, adding_flag=False):

        super().__init__()
        self.setAcceptHoverEvents(True)
@@ -76,10 +75,6 @@ class LinkItem(QtWidgets.QGraphicsPathItem):
        # default pen size
        self._pen_width = 2.0

-        # indicates the link position when there are multiple links
-        # between the same source and destination
-        self._multilink = multilink
-
        # source & destination items and ports
        self._source_item = source_item
        self._destination_item = destination_item
@@ -108,8 +103,10 @@ class LinkItem(QtWidgets.QGraphicsPathItem):

        self.adjust()

-    def _linkDeletedSlot(self, link_id):
+    @qslot
+    def _linkDeletedSlot(self, link_id, *args):
        # first delete the port labels if any
+
        if self._source_port.label():
            self._source_port.label().setParentItem(None)
            self.scene().removeItem(self._source_port.label())
@@ -117,11 +114,9 @@ class LinkItem(QtWidgets.QGraphicsPathItem):
            self._destination_port.label().setParentItem(None)
            self.scene().removeItem(self._destination_port.label())

-        self._source_item.removeLink(self)
-        self._destination_item.removeLink(self)
-
-        if self in self.scene().items():
-            self.scene().removeItem(self)
+        if self.scene():
+            if self in self.scene().items():
+                self.scene().removeItem(self)

    def delete(self):
        """
@@ -349,6 +344,7 @@ class LinkItem(QtWidgets.QGraphicsPathItem):

        self.setHovered(False)

+    @qslot
    def adjust(self):
        """
        Computes the source point and destination point.
@@ -376,15 +372,54 @@ class LinkItem(QtWidgets.QGraphicsPathItem):
        # compute the length of the line
        self.length = math.sqrt(self.dx * self.dx + self.dy * self.dy)

+        multilink = self._computeMultiLink()
+
        # multi-link management
-        if not self._adding_flag and self._multilink and self.length:
+        if not self._adding_flag and multilink and self.length:
            angle = math.radians(90)
            self.dxrot = math.cos(angle) * self.dx - math.sin(angle) * self.dy
            self.dyrot = math.sin(angle) * self.dx + math.cos(angle) * self.dy
-            offset = QtCore.QPointF((self.dxrot * (self._multilink * 5)) / self.length, (self.dyrot * (self._multilink * 5)) / self.length)
+            offset = QtCore.QPointF((self.dxrot * (multilink * 5)) / self.length, (self.dyrot * (multilink * 5)) / self.length)
            self.source = QtCore.QPointF(self.source + offset)
            self.destination = QtCore.QPointF(self.destination + offset)

+    def _computeMultiLink(self):
+        # Multi-link management
+        #
+        # multi is the offset of the link
+        # +------+       multi = -1    Link 2  +-------+
+        # |      +-----------------------------+       |
+        # |  R1  |                             |   R2  |
+        # |      |        multi = 0    Link 1  |       |
+        # |      +-----------------------------+       |
+        # |      |        multi = 1    Link 3  |       |
+        # +------+-----------------------------+-------+
+
+        if self._source_item == self._destination_item:
+            multi = 0
+        elif not hasattr(self._destination_item, "node"):  # Could be temporary a qpointf during link creation
+            multi = 0
+        else:
+            multi = 0
+            link_items = self._source_item.links()
+            for link_item in link_items:
+                if link_item == self:
+                    break
+                if link_item.destinationItem().node().id() == self._destination_item.node().id():
+                    multi += 1
+                if link_item.sourceItem().node().id() == self._destination_item.node().id():
+                    multi += 1
+
+        # MAX 7 links on the scene between 2 nodes
+        if multi > 7:
+            multi = 0
+        # Pair item represent the bottom links
+        elif multi % 2 == 0:
+            multi = multi // 2
+        else:
+            multi = -multi // 2
+        return multi
+
    def setMousePoint(self, scene_point):
        """
        Sets new mouse point coordinates.
@@ -397,7 +432,8 @@ class LinkItem(QtWidgets.QGraphicsPathItem):
        self.adjust()
        self.update()

-    def _drawCaptureSymbol(self):
+    @qslot
+    def _drawCaptureSymbol(self, *args):
        """
        Draws a capture symbol in the middle of the link to indicate a capture is active.
        """
--- a/gns3/items/node_item.py
+++ b/gns3/items/node_item.py
@@ -19,7 +19,9 @@
 Graphical representation of a node on the QGraphicsScene.
 """

-from ..qt import QtCore, QtGui, QtWidgets, QtSvg
+import sip
+
+from ..qt import QtCore, QtGui, QtWidgets, QtSvg, qslot
 from ..qt.qimage_svg_renderer import QImageSvgRenderer
 from .note_item import NoteItem
 from ..symbol import Symbol
@@ -39,6 +41,7 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
    """

    show_layer = False
+    GRID_SIZE = 75

    def __init__(self, node):
        super().__init__()
@@ -56,9 +59,10 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
        # node label
        self._node_label = None

-        # Temporary symbol during loading
        self.setPos(QtCore.QPoint(self._node.x(), self._node.y()))
        self.setZValue(self._node.z())
+
+        # Temporary symbol during loading
        renderer = QImageSvgRenderer(":/icons/reload.svg")
        renderer.setObjectName("symbol_loading")
        self.setSharedRenderer(renderer)
@@ -96,18 +100,28 @@ class NodeItem(QtSvg.QGraphicsSvgItem):

        from ..main_window import MainWindow
        self._main_window = MainWindow.instance()
+        if self._main_window.uiSnapToGridAction.isChecked():
+            self._snapToGrid()
        self._settings = self._main_window.uiGraphicsView.settings()

        if node.initialized():
            self.createdSlot(node.id())

-    def _updateNode(self):
+    def _snapToGrid(self):
+        mid_x = self.boundingRect().width() / 2
+        x = (self.GRID_SIZE * round((self.x() + mid_x) / self.GRID_SIZE)) - mid_x
+        mid_y = self.boundingRect().height() / 2
+        y = (self.GRID_SIZE * round((self.y() + mid_y) / self.GRID_SIZE)) - mid_y
+        self.setPos(x, y)
+
+    def updateNode(self):
        """
        Sync change to the node
        """
        if self._initialized:
            self._node.setGraphics(self)

+    @qslot
    def setSymbol(self, symbol):
        """
        :param symbol: Change the symbol path
@@ -128,16 +142,17 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
    def symbol(self):
        return self._symbol

-    def _symbolLoadedCallback(self, path):
-        renderer = QImageSvgRenderer(path)
+    @qslot
+    def _symbolLoadedCallback(self, path, *args):
+        renderer = QImageSvgRenderer(path, fallback=":/icons/cancel.svg")
        renderer.setObjectName(path)
        self.setSharedRenderer(renderer)
        if self._node.settings().get("symbol") != self._symbol:
-            self._updateNode()
+            self.updateNode()
        if not self._initialized:
            self._showLabel()
            self._initialized = True
-            self._updateNode()
+            self.updateNode()

    def node(self):
        """
@@ -153,25 +168,39 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
        self._node.setSettingValue("x", int(self.x()))
        self._node.setSettingValue("y", int(self.y()))

-    def addLink(self, link):
+    @qslot
+    def addLink(self, link_item, *args):
        """
        Adds a link items to this node item.

        :param link: LinkItem instance
        """

-        self._links.append(link)
+        if not sip.isdeleted(link_item):
+            self._links.append(link_item)
+            link_item.link().delete_link_signal.connect(self._removeLink)
+            link_item.link().updated_link_signal.connect(self._linkUpdatedSlot)
+            self._node.updated_signal.emit()
+
+    @qslot
+    def _linkUpdatedSlot(self, *args):
+        """
+        When a link change we also notify the listener of the node
+        """
        self._node.updated_signal.emit()

-    def removeLink(self, link):
+    @qslot
+    def _removeLink(self, link_id, *args):
        """
        Removes a link items from this node item.

        :param link: LinkItem instance
        """

-        if link in self._links:
-            self._links.remove(link)
+        for link_item in self._links:
+            if link_item.link().id() == link_id:
+                self._links.remove(link_item)
+                return

    def links(self):
        """
@@ -182,7 +211,8 @@ class NodeItem(QtSvg.QGraphicsSvgItem):

        return self._links

-    def createdSlot(self, base_node_id):
+    @qslot
+    def createdSlot(self, base_node_id, *args):
        """
        Slot to receive events from the attached Node instance
        when a the node has been created/initialized.
@@ -190,54 +220,47 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
        :param base_node_id: base node identifier (integer)
        """

-        if self is None:
-            return
        self.setPos(QtCore.QPoint(self._node.x(), self._node.y()))
        self.setSymbol(self._node.symbol())
        self.update()

-    def startedSlot(self):
+    @qslot
+    def startedSlot(self, *args):
        """
        Slot to receive events from the attached Node instance
        when a the node has started.
        """

-        if self is None:
-            return
        for link in self._links:
            link.update()

-    def stoppedSlot(self):
+    @qslot
+    def stoppedSlot(self, *args):
        """
        Slot to receive events from the attached Node instance
        when a the node has stopped.
        """

-        if self is None:
-            return
        for link in self._links:
            link.update()

-    def suspendedSlot(self):
+    @qslot
+    def suspendedSlot(self, *args):
        """
        Slot to receive events from the attached Node instance
        when a the node has suspended.
        """

-        if self is None:
-            return
        for link in self._links:
            link.update()

-    def updatedSlot(self):
+    @qslot
+    def updatedSlot(self, *args):
        """
        Slot to receive events from the attached Node instance
        when a the node has been updated.
        """

-        if self is None:
-            return
-
        self.setSymbol(self._node.settings().get("symbol"))
        self.setPos(self._node.settings().get("x", 0), self._node.settings().get("y", 0))
        self.setZValue(self._node.settings().get("z", 0))
@@ -249,18 +272,20 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
        for link in self._links:
            link.setCustomToolTip()

-    def deletedSlot(self):
+    @qslot
+    def deletedSlot(self, *args):
        """
        Slot to receive events from the attached Node instance
        when the node has been deleted.
        """

-        if self is None or not self.scene():
+        if not self.scene():
            return
        if self in self.scene().items():
            self.scene().removeItem(self)

-    def serverErrorSlot(self, base_node_id, message):
+    @qslot
+    def serverErrorSlot(self, base_node_id, message, *args):
        """
        Slot to receive events from the attached Node instance
        when the node has received an error from the server.
@@ -269,10 +294,10 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
        :param message: error message
        """

-        if self:
-            self._last_error = "{message}".format(message=message)
+        self._last_error = "{message}".format(message=message)

-    def errorSlot(self, base_node_id, message):
+    @qslot
+    def errorSlot(self, base_node_id, message, *args):
        """
        Slot to receive events from the attached Node instance
        when the node wants to report an error.
@@ -281,8 +306,7 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
        :param message: error message
        """

-        if self:
-            self._last_error = "{message}".format(message=message)
+        self._last_error = "{message}".format(message=message)

    def setCustomToolTip(self):
        """
@@ -311,7 +335,7 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
        """
        Called when user unselect the label
        """
-        self._updateNode()
+        self.updateNode()

    def _centerLabel(self):
        """
@@ -354,7 +378,7 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
        self._node_label.setRotation(label_data["rotation"])
        if label_data["x"] is None:
            self._centerLabel()
-            self._updateNode()
+            self.updateNode()
        else:
            self._node_label.setPos(label_data["x"], label_data["y"])

@@ -433,14 +457,11 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
        :param value: value of the change
        """

-        if change == QtWidgets.QGraphicsItem.ItemPositionHasChanged and self.isActive() and self._main_window.uiSnapToGridAction.isChecked():
-            GRID_SIZE = 75
+        if change == QtWidgets.QGraphicsItem.ItemPositionChange and self.isActive() and self._main_window.uiSnapToGridAction.isChecked():
            mid_x = self.boundingRect().width() / 2
-            tmp_x = (GRID_SIZE * round((self.x() + mid_x) / GRID_SIZE)) - mid_x
+            value.setX((self.GRID_SIZE * round((value.x() + mid_x) / self.GRID_SIZE)) - mid_x)
            mid_y = self.boundingRect().height() / 2
-            tmp_y = (GRID_SIZE * round((self.y() + mid_y) / GRID_SIZE)) - mid_y
-            if tmp_x != self.x() and tmp_y != self.y():
-                self.setPos(tmp_x, tmp_y)
+            value.setY((self.GRID_SIZE * round((value.y() + mid_y) / self.GRID_SIZE)) - mid_y)

        # dynamically change the renderer when this node item is selected/unselected.
        if change == QtWidgets.QGraphicsItem.ItemSelectedChange:
@@ -448,7 +469,7 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
                self.graphicsEffect().setEnabled(True)
            else:
                self.graphicsEffect().setEnabled(False)
-                self._updateNode()
+                self.updateNode()

        # adjust link item positions when this node is moving or has changed.
        if change == QtWidgets.QGraphicsItem.ItemPositionChange or change == QtWidgets.QGraphicsItem.ItemPositionHasChanged:
@@ -508,7 +529,6 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
                self._node_label.setFlag(self.ItemIsMovable, True)
        for link in self._links:
            link.adjust()
-        self._node.setSettingValue("z", int(value))

    def hoverEnterEvent(self, event):
        """
@@ -537,4 +557,4 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
        It the item is select but mouse is not on it the event
        is send also
        """
-        self._updateNode()
+        self.updateNode()
--- a/gns3/items/note_item.py
+++ b/gns3/items/note_item.py
@@ -208,6 +208,10 @@ class NoteItem(QtWidgets.QGraphicsTextItem):
                    font.setItalic(True)
                elif key == "font-weight" and val == "bold":
                    font.setBold(True)
+                elif key == "text-decoration" and val == "underline":
+                    font.setUnderline(True)
+                elif key == "text-decoration" and val == "line-through":
+                    font.setStrikeOut(True)
                elif key == "fill":
                    new_color = colorFromSvg(val)
                    color = self.defaultTextColor()
@@ -256,6 +260,11 @@ class NoteItem(QtWidgets.QGraphicsTextItem):
        if self.font().bold():
            style += "font-weight: bold;"

+        if self.font().strikeOut():
+            style += "text-decoration: line-through;"
+        elif self.font().underline():
+            style += "text-decoration: underline;"
+
        style += "fill: {};".format("#" + hex(self.defaultTextColor().rgba())[4:])
        style += "fill-opacity: {};".format(self.defaultTextColor().alphaF())

--- a/gns3/items/serial_link_item.py
+++ b/gns3/items/serial_link_item.py
@@ -37,12 +37,11 @@ class SerialLinkItem(LinkItem):
    :param destination_port: destination Port instance
    :param link: Link instance (contains back-end stuff for this link)
    :param adding_flag: indicates if this link is being added (no destination yet)
-    :param multilink: used to draw multiple link between the same source and destination
    """

-    def __init__(self, source_item, source_port, destination_item, destination_port, link=None, adding_flag=False, multilink=0):
+    def __init__(self, source_item, source_port, destination_item, destination_port, link=None, adding_flag=False):

-        super().__init__(source_item, source_port, destination_item, destination_port, link, adding_flag, multilink)
+        super().__init__(source_item, source_port, destination_item, destination_port, link, adding_flag)

    def adjust(self):
        """
@@ -132,8 +131,7 @@ class SerialLinkItem(LinkItem):
            source_port_label = self._source_port.label()
            if source_port_label is None:
                source_port_label = NoteItem(self._source_item)
-                source_port_name = self._source_port.name()
-                source_port_label.setPlainText(source_port_name)
+                source_port_label.setPlainText(self._source_port.shortName())
                source_port_label.setPos(self.mapToItem(self._source_item, self.source))
                self._source_port.setLabel(source_port_label)

@@ -163,8 +161,7 @@ class SerialLinkItem(LinkItem):

            if destination_port_label is None:
                destination_port_label = NoteItem(self._destination_item)
-                destination_port_name = self._destination_port.name()
-                destination_port_label.setPlainText(destination_port_name)
+                destination_port_label.setPlainText(self._destination_port.shortName())
                destination_port_label.setPos(self.mapToItem(self._destination_item, self.destination))
                self._destination_port.setLabel(destination_port_label)

--- a/gns3/items/shape_item.py
+++ b/gns3/items/shape_item.py
@@ -20,7 +20,7 @@ Base class for shape items (Rectangle, ellipse etc.).
 """

 import xml.etree.ElementTree as ET
-from ..qt import QtCore, QtGui, QtWidgets, QtSvg
+from ..qt import QtCore, QtGui, QtWidgets
 from .drawing_item import DrawingItem
 from .utils import colorFromSvg

@@ -35,12 +35,11 @@ class ShapeItem(DrawingItem):
        QtCore.Qt.SolidLine: "",
        QtCore.Qt.NoPen: None,
        QtCore.Qt.DashLine: "25, 25",
-        QtCore.Qt.DotLine:  "5, 25",
-        QtCore.Qt.DashDotLine:  "5, 25, 25",
+        QtCore.Qt.DotLine: "5, 25",
+        QtCore.Qt.DashDotLine: "5, 25, 25",
        QtCore.Qt.DashDotDotLine: "25, 25, 5, 25, 5"
    }

-
    """
    Base class to draw shapes on the scene.
    """
@@ -192,10 +191,10 @@ class ShapeItem(DrawingItem):
        element.set("fill-opacity", str(self.brush().color().alphaF()))

        dasharray = self.QT_DASH_TO_SVG[pen.style()]
-        if dasharray is None: # No border to the element
+        if dasharray is None:  # No border to the element
            return element
        elif dasharray == "":
-            pass # Solid line
+            pass  # Solid line
        else:
            element.set("stroke-dasharray", dasharray)
        element.set("stroke-width", str(pen.width()))
@@ -239,7 +238,7 @@ class ShapeItem(DrawingItem):
                stroke = svg[0].get("stroke-dasharray")
                if stroke:
                    for (qt_stroke, svg_stroke) in self.QT_DASH_TO_SVG.items():
-                         if svg_stroke == stroke:
+                        if svg_stroke == stroke:
                            pen.setStyle(qt_stroke)

        self.setPen(pen)
--- a/gns3/items/text_item.py
+++ b/gns3/items/text_item.py
@@ -26,10 +26,15 @@ from .drawing_item import DrawingItem
 from .utils import colorFromSvg


+import logging
+log = logging.getLogger(__name__)
+
+
 class TextItem(QtWidgets.QGraphicsTextItem, DrawingItem):
    """
    Text item for the QGraphicsView.
    """
+
    def __init__(self, svg=None, **kws):

        super().__init__(**kws)
@@ -44,7 +49,10 @@ class TextItem(QtWidgets.QGraphicsTextItem, DrawingItem):
        self.setFont(qt_font)

        if svg:
-            svg = self.fromSvg(svg)
+            try:
+                svg = self.fromSvg(svg)
+            except ET.ParseError as e:
+                log.warning(str(e))

        if self._id is None:
            self.create()
@@ -118,6 +126,10 @@ class TextItem(QtWidgets.QGraphicsTextItem, DrawingItem):
            text.set("font-style", "italic")
        if self.font().bold():
            text.set("font-weight", "bold")
+        if self.font().strikeOut():
+            text.set("text-decoration", "line-through")
+        elif self.font().underline():
+            text.set("text-decoration", "underline")
        text.set("fill", "#" + hex(self.defaultTextColor().rgba())[4:])
        text.set("fill-opacity", str(self.defaultTextColor().alphaF()))
        text.text = self.toPlainText()
@@ -151,6 +163,10 @@ class TextItem(QtWidgets.QGraphicsTextItem, DrawingItem):
            font.setItalic(True)
        if text.get("font-weight") == "bold":
            font.setBold(True)
+        if text.get("text-decoration") == "underline":
+            font.setUnderline(True)
+        if text.get("text-decoration") == "line-through":
+            font.setStrikeOut(True)

        self.setFont(font)
        self.setPlainText(text.text)
--- a/gns3/items/utils.py
+++ b/gns3/items/utils.py
@@ -23,7 +23,9 @@ def colorFromSvg(value):
    Transform a color coming from a SVG file to a Qcolor
    """
    value = value.strip('#')
-    if len(value) == 6: # If alpha channel is missing
+    if value == "":
+        value = "000000"
+    if len(value) == 6:  # If alpha channel is missing
        value = "ff" + value
    value = int(value, base=16)
    return QtGui.QColor.fromRgba(value)
--- a/gns3/link.py
+++ b/gns3/link.py
@@ -21,8 +21,8 @@ Manages and stores everything needed for a connection between 2 devices.

 import os
 import re
+import sip
 import uuid
-import tempfile

 from .qt import QtCore, QtWidgets
 from .controller import Controller
@@ -77,6 +77,7 @@ class Link(QtCore.QObject):
        self._link_id = link_id
        self._capturing = False
        self._capture_file_path = None
+        self._capture_file = None
        self._initialized = False

        # Boolean if True we are creatin the first instance of this node
@@ -104,7 +105,10 @@ class Link(QtCore.QObject):
        # If the controller is remote the capture path should be rewrite to something local
        if Controller.instance().isRemote():
            if self._capture_file_path is None and result.get("capture_file_path", None) is not None:
-                (handle, self._capture_file_path) = tempfile.mkstemp()
+                self._capture_file = QtCore.QTemporaryFile()
+                self._capture_file.open(QtCore.QFile.WriteOnly)
+                self._capture_file.setAutoRemove(True)
+                self._capture_file_path = self._capture_file.fileName()
                Controller.instance().get(
                    "/projects/{project_id}/links/{link_id}/pcap".format(
                        project_id=self.project().id(),
@@ -112,6 +116,7 @@ class Link(QtCore.QObject):
                    None,
                    showProgress=False,
                    downloadProgressCallback=self._downloadPcapProgress,
+                    ignoreErrors=True,  # If something is wrong avoid disconnect us from server
                    timeout=None)
        else:
            self._capture_file_path = result["capture_file_path"]
@@ -160,7 +165,7 @@ class Link(QtCore.QObject):
                raise NotImplementedError

    def _updateLabel(self, label, label_data):
-        if not label:
+        if not label or sip.isdeleted(label):
            return
        label.setPlainText(label_data["text"])
        label.setPos(label_data["x"], label_data["y"])
@@ -191,6 +196,7 @@ class Link(QtCore.QObject):
    def _linkCreatedCallback(self, result, error=False, **kwargs):
        if error:
            QtWidgets.QMessageBox.warning(None, "Create link", "Error while creating link: {}".format(result["message"]))
+            self.deleteLink(skip_controller=True)
            return

        self._initialized = True
@@ -311,15 +317,14 @@ class Link(QtCore.QObject):
        """
        if not self._capture_file_path:
            return
-        try:
-            with open(self._capture_file_path, 'ab') as f:
-                f.write(content)
-        except OSError as e:
-            log.error("Can't write file {}: {}".format(self._capture_file_path, e), True)
-            return
+        self._capture_file.write(content)
+        self._capture_file.flush()

    def stopCapture(self):
        if Controller.instance().isRemote():
+            if self._capture_file:
+                self._capture_file.close()
+                self._capture_file = None
            if self._capture_file_path:
                try:
                    os.remove(self._capture_file_path)
--- a/gns3/local_config.py
+++ b/gns3/local_config.py
@@ -23,7 +23,7 @@ import copy

 import psutil

-from .qt import QtCore, QtWidgets
+from .qt import QtCore, QtWidgets, qslot
 from .version import __version__
 from .utils import parse_version
 from .controller import Controller
@@ -39,6 +39,8 @@ class LocalConfig(QtCore.QObject):
    """

    config_changed_signal = QtCore.Signal()
+    # When this signal is emit the config is saved on controller
+    save_on_controller_signal = QtCore.Signal()

    def __init__(self, config_file=None):
        """
@@ -48,8 +50,27 @@ class LocalConfig(QtCore.QObject):
        super().__init__()
        self._profile = None
        self._config_file = config_file
+        # Security to avoid pushing to the controller settings before
+        # we get the original settings from controller
+        self._settings_retrieved_from_controller = False
        self._migrateOldConfigPath()
        self._resetLoadConfig()
+        self._monitoring_changes = False
+        Controller.instance().connected_signal.connect(self.refreshConfigFromController)
+        self.save_on_controller_signal.connect(self._saveOnController)
+
+    def _monitorChanges(self):
+        """
+        Poll the remote server waiting for settings update
+        """
+        if self._monitoring_changes:
+            return
+        self._monitoring_changes = True
+        self._timer = QtCore.QTimer()
+        self._timer.setInterval(5000)
+        self._refreshingSettings = False
+        self._timer.timeout.connect(self.refreshConfigFromController)
+        self._timer.start()

    def _resetLoadConfig(self):
        """
@@ -97,8 +118,7 @@ class LocalConfig(QtCore.QObject):
        # overwrite system wide settings with user specific ones
        self._settings.update(user_settings)
        self._migrateOldConfig()
-        self._writeConfig()
-        Controller.instance().connected_signal.connect(self.refreshConfigFromController)
+        self.writeConfig()

    def profile(self):
        """
@@ -116,28 +136,36 @@ class LocalConfig(QtCore.QObject):
            self._config_file = None
            self._resetLoadConfig()

+    @qslot
    def refreshConfigFromController(self):
        """
        Refresh the configuration from the controller
        """
        controller = Controller.instance()
        if controller.connected():
-            controller.get("/settings", self._getSettingsCallback)
+            self._refreshingSettings = True
+            controller.get("/settings", self._getSettingsCallback, showProgress=False)
+        self._monitorChanges()

    def _getSettingsCallback(self, result, error=False, **kwargs):
+        self._refreshingSettings = False
        if error:
            log.error("Can't get settings from controller")
            return
        if result == {} and self._settings != {}:
-            self._saveOnController()
+            self._settings_retrieved_from_controller = True
+            self.save_on_controller_signal.emit()
            return

-        self._settings.update(result)
-        # Update already loaded section
-        for section in self._settings.keys():
-            if isinstance(self._settings[section], dict):
-                self.loadSectionSettings(section, self._settings[section])
-        self.config_changed_signal.emit()
+        # The server return an uuid to keep track of settings version
+        if self._settings.get("modification_uuid") != result.get("modification_uuid"):
+            self._settings.update(result)
+            # Update already loaded section
+            for section in self._settings.keys():
+                if isinstance(self._settings[section], dict):
+                    self.loadSectionSettings(section, self._settings[section])
+            self.config_changed_signal.emit()
+        self._settings_retrieved_from_controller = True

    def configDirectory(self):
        """
@@ -181,8 +209,8 @@ class LocalConfig(QtCore.QObject):
        # settings from 1.6.1 with 1.5.1 you will have an error
        if "version" in self._settings:
            if parse_version(self._settings["version"])[:2] > parse_version(__version__)[:2]:
-                app = QtWidgets.QApplication(sys.argv)  # We need to create an application because settings are loaded before Qt init
-                QtWidgets.QMessageBox.critical(None, "Version error", "Your settings are for version {} of GNS3. You cannot use a previous version of GNS3 without risking losing data.".format(self._settings["version"]))
+                QtWidgets.QApplication(sys.argv)  # We need to create an application because settings are loaded before Qt init
+                QtWidgets.QMessageBox.critical(None, "Version error", "Your settings are for version {} of GNS3. You cannot use a previous version of GNS3 without risking losing data. If you want to reset delete the settings in {}".format(self._settings["version"], self.configDirectory()))
                # Exit immediately not clean but we want to avoid any side effect that could corrupt the file
                sys.exit(1)

@@ -212,7 +240,7 @@ class LocalConfig(QtCore.QObject):
                from .settings import PRECONFIGURED_TELNET_CONSOLE_COMMANDS, DEFAULT_TELNET_CONSOLE_COMMAND

                if "MainWindow" in self._settings:
-                    if self._settings["MainWindow"]["telnet_console_command"] not in PRECONFIGURED_TELNET_CONSOLE_COMMANDS.values():
+                    if self._settings["MainWindow"].get("telnet_console_command") not in PRECONFIGURED_TELNET_CONSOLE_COMMANDS.values():
                        self._settings["MainWindow"]["telnet_console_command"] = DEFAULT_TELNET_CONSOLE_COMMAND

        # Migrate 1.X to 2.0
@@ -226,6 +254,16 @@ class LocalConfig(QtCore.QObject):
                        vms.append(vm)
                self._settings["Qemu"]["vms"] = vms

+        # Starting with 2.0.0dev5 IOU licence is stored in the settings
+        if "version" not in self._settings or parse_version(self._settings["version"]) < parse_version("2.0.0"):
+            if "IOU" in self._settings and "iourc_path" in self._settings["IOU"] and "iourc_content" not in self._settings["IOU"]:
+                try:
+                    with open(self._settings["IOU"]["iourc_path"], "r") as f:
+                        self._settings["IOU"]["iourc_content"] = f.read().replace("\r\n", "\n")
+                        del self._settings["IOU"]["iourc_path"]
+                except OSError as e:
+                    log.warn("Can't import IOU licence {}: {}".format(self._settings["IOU"]["iourc_path"], str(e)))
+
    def _readConfig(self, config_path):
        """
        Read the configuration file.
@@ -247,7 +285,7 @@ class LocalConfig(QtCore.QObject):

        return dict()

-    def _writeConfig(self):
+    def writeConfig(self):
        """
        Write the configuration file.
        """
@@ -262,16 +300,17 @@ class LocalConfig(QtCore.QObject):
            self._last_config_changed = os.stat(self._config_file).st_mtime
        except (ValueError, OSError) as e:
            log.error("Could not write the config file {}: {}".format(self._config_file, e))
-        self._saveOnController()
+        self.save_on_controller_signal.emit()

-    def _saveOnController(self):
+    @qslot
+    def _saveOnController(self, *args):
        """
        Save some settings on controller for the transition from
        GUI to a central controller. Will be removed later
        """
-        if Controller.instance().connected():
+        if Controller.instance().connected() and self._settings_retrieved_from_controller:
            # We save only non user specific sections
-            section_to_save_on_controller = ["Builtin", "Docker", "IOU", "Qemu", "VMware", "VPCS", "VirtualBox", "GraphicsView"]
+            section_to_save_on_controller = ["Builtin", "Docker", "IOU", "Qemu", "VMware", "VPCS", "VirtualBox", "GraphicsView", "Dynamips"]
            controller_settings = {}
            for key, val in self._settings.items():
                if key in section_to_save_on_controller:
@@ -328,7 +367,7 @@ class LocalConfig(QtCore.QObject):

        if self._settings != settings:
            self._settings.update(settings)
-            self._writeConfig()
+            self.writeConfig()
            self.config_changed_signal.emit()

    def loadSectionSettings(self, section, default_settings):
@@ -364,7 +403,7 @@ class LocalConfig(QtCore.QObject):

        if changed:
            log.info("Section %s has missing default values. Adding keys %s Saving configuration", section, ','.join(set(default_settings.keys()) - set(settings.keys())))
-            self._writeConfig()
+            self.writeConfig()

        return copy.deepcopy(settings)

@@ -382,7 +421,7 @@ class LocalConfig(QtCore.QObject):
        if self._settings[section] != settings:
            self._settings[section].update(copy.deepcopy(settings))
            log.info("Section %s has changed. Saving configuration", section)
-            self._writeConfig()
+            self.writeConfig()
        else:
            log.debug("Section %s has not changed. Skip saving configuration", section)

@@ -394,6 +433,14 @@ class LocalConfig(QtCore.QObject):
        from gns3.settings import GENERAL_SETTINGS
        return self.loadSectionSettings("MainWindow", GENERAL_SETTINGS)["experimental_features"]

+    def hdpi(self):
+        """
+        :returns: Boolean. True if hdpi is allowed
+        """
+
+        from gns3.settings import GENERAL_SETTINGS
+        return self.loadSectionSettings("MainWindow", GENERAL_SETTINGS)["hdpi"]
+
    def multiProfiles(self):
        """
        :returns: Boolean. True if multi_profiles is enabled
--- a/gns3/local_server.py
+++ b/gns3/local_server.py
@@ -81,22 +81,30 @@ class LocalServer(QtCore.QObject):
    """

    def __init__(self, parent=None):
+        # Remember if the server was started by us or not
+        self._server_started_by_me = False
+        self._local_server_path = ""
+        self._local_server_process = None

        super().__init__()
        self._parent = parent
-        self._local_server_path = ""
-        self._local_server_process = None
        self._config_directory = LocalConfig.instance().configDirectory()
        self._settings = {}
        self.localServerSettings()
        self._port = self._settings.get("port", 3080)
-
        if not self._settings.get("auto_start", True):
-            self._http_client = HTTPClient(self._settings)
-            Controller.instance().setHttpClient(self._http_client)
+            if self._settings.get("host") is None:
+                self._http_client = HTTPClient(self._settings)
+                Controller.instance().setHttpClient(self._http_client)
        else:
            self._http_client = None

+        self._stopping = False
+        self._timer = QtCore.QTimer()
+        self._timer.setInterval(5000)
+        self._timer.timeout.connect(self._checkLocalServerRunningSlot)
+        self._timer.start()
+
    def _pid_path(self):
        """
        :returns: Path of the PID file
@@ -156,7 +164,7 @@ class LocalServer(QtCore.QObject):
                        proceed = QtWidgets.QMessageBox.question(
                            self.parent(),
                            "uBridge",
-                            "uBridge requires CAP_NET_RAW capability to interact with network interfaces. Set the capability to uBridge?",
+                            "uBridge requires CAP_NET_RAW capability to interact with network interfaces. Set the capability to uBridge? All users on the system will be able to read packet from the network interfaces.",
                            QtWidgets.QMessageBox.Yes,
                            QtWidgets.QMessageBox.No)
                        if proceed == QtWidgets.QMessageBox.Yes:
@@ -164,6 +172,10 @@ class LocalServer(QtCore.QObject):
                else:
                    # capabilities not supported
                    request_setuid = True
+            except AttributeError:
+                # Due to a Python bug, os.listxattr could be missing: https://github.com/GNS3/gns3-gui/issues/2010
+                log.warning("Could not determine if CAP_NET_RAW capability is set for uBridge (Python bug)")
+                return True
            except OSError as e:
                QtWidgets.QMessageBox.critical(self.parent(), "uBridge", "Can't set CAP_NET_RAW capability to uBridge {}: {}".format(path, str(e)))
                return False
@@ -174,12 +186,11 @@ class LocalServer(QtCore.QObject):
                    proceed = QtWidgets.QMessageBox.question(
                        self.parent(),
                        "uBridge",
-                        "uBridge requires root permissions to interact with network interfaces. Set root permissions to uBridge?",
+                        "uBridge requires root permissions to interact with network interfaces. Set root permissions to uBridge?  All admin users on the system will be able to read packet from the network interfaces.",
                        QtWidgets.QMessageBox.Yes,
                        QtWidgets.QMessageBox.No)
                    if proceed == QtWidgets.QMessageBox.Yes:
-                        sudo(["chmod", "4755", path])
-                        sudo(["chown", "root", path])
+                        sudo(["chown", "root:admin", path], ["chmod", "4750", path])
            except OSError as e:
                QtWidgets.QMessageBox.critical(self.parent(), "uBridge", "Can't set root permissions to uBridge {}: {}".format(path, str(e)))
                return False
@@ -243,13 +254,25 @@ class LocalServer(QtCore.QObject):
        # Settings have changed we need to restart the server
        if old_settings != self._settings:
            if self._settings["auto_start"]:
-                self.stopLocalServer(wait=True)
+                # We restart the local server only if we really need. Auth can be hot change
+                settings_require_restart = ('host', 'port', 'path')
+                need_restart = False
+                for s in settings_require_restart:
+                    if old_settings.get(s) != self._settings.get(s):
+                        need_restart = True
+
+                if need_restart:
+                    self.stopLocalServer(wait=True)
+
                self.localServerAutoStartIfRequire()
            # If the controller is remote:
            else:
                self.stopLocalServer(wait=True)

-            self._http_client = HTTPClient(self._settings)
+            if self._settings.get("host") is None:
+                self._http_client = None
+            else:
+                self._http_client = HTTPClient(self._settings)
            Controller.instance().setHttpClient(self._http_client)

    def shouldLocalServerAutoStart(self):
@@ -260,7 +283,7 @@ class LocalServer(QtCore.QObject):
        :returns: boolean
        """

-        return self._settings["auto_start"]
+        return self._settings["auto_start"] and self._settings["host"] is not None

    def localServerPath(self):
        """
@@ -293,8 +316,13 @@ class LocalServer(QtCore.QObject):
        """

        if not self.shouldLocalServerAutoStart():
+            self._http_client = HTTPClient(self._settings)
+            Controller.instance().setHttpClient(self._http_client)
            return

+        if self.isLocalServerRunning() and self._server_started_by_me:
+            return True
+
        # We check if two gui are not launched at the same time
        # to avoid killing the server of the other GUI
        if not LocalConfig.isMainGui():
@@ -326,7 +354,7 @@ class LocalServer(QtCore.QObject):
            progress_dialog.show()
            if not progress_dialog.exec_():
                return False
-
+        self._server_started_by_me = True
        self._http_client = HTTPClient(self._settings)
        Controller.instance().setHttpClient(self._http_client)

@@ -342,7 +370,7 @@ class LocalServer(QtCore.QObject):
        if sys.platform.startswith('win'):
            if not self._checkWindowsService("npf") and not self._checkWindowsService("npcap"):
                QtWidgets.QMessageBox.critical(self.parent(), "Error", "The NPF or NPCAP service is not installed, please install Winpcap or Npcap and reboot.")
-                return
+                return False

        self._port = self._settings["port"]

@@ -350,13 +378,13 @@ class LocalServer(QtCore.QObject):
        local_server_path = self.localServerPath()
        if not local_server_path:
            log.warn("No local server is configured")
-            return
+            return False
        if not os.path.isfile(local_server_path):
            QtWidgets.QMessageBox.critical(self.parent(), "Local server", "Could not find local server {}".format(local_server_path))
-            return
+            return False
        elif not os.access(local_server_path, os.X_OK):
            QtWidgets.QMessageBox.critical(self.parent(), "Local server", "{} is not an executable".format(local_server_path))
-            return
+            return False

        try:
            # check if the local address still exists
@@ -411,6 +439,7 @@ class LocalServer(QtCore.QObject):
        Starts the local server process.
        """

+        self._stopping = False
        path = self.localServerPath()
        command = '"{executable}" --local'.format(executable=path)

@@ -442,11 +471,11 @@ class LocalServer(QtCore.QObject):
        try:
            if sys.platform.startswith("win"):
                # use the string on Windows
-                self._local_server_process = subprocess.Popen(command, creationflags=subprocess.CREATE_NEW_PROCESS_GROUP)
+                self._local_server_process = subprocess.Popen(command, creationflags=subprocess.CREATE_NEW_PROCESS_GROUP, stderr=subprocess.PIPE)
            else:
                # use arguments on other platforms
                args = shlex.split(command)
-                self._local_server_process = subprocess.Popen(args)
+                self._local_server_process = subprocess.Popen(args, stderr=subprocess.PIPE)
        except (OSError, subprocess.SubprocessError) as e:
            log.warning('Could not start local server "{}": {}'.format(command, e))
            return False
@@ -454,6 +483,16 @@ class LocalServer(QtCore.QObject):
        log.info("Local server process has started (PID={})".format(self._local_server_process.pid))
        return True

+    def _checkLocalServerRunningSlot(self):
+        if self._local_server_process and not self._stopping:
+            if not self.localServerProcessIsRunning():
+                log.error("Local server process has stopped")
+                try:
+                    log.error(self._local_server_process.stderr.read().decode())
+                except (OSError, UnicodeDecodeError):
+                    pass
+                self._local_server_process = None
+
    def localServerProcessIsRunning(self):
        """
        Returns either the local server is running.
@@ -475,7 +514,7 @@ class LocalServer(QtCore.QObject):
        :returns: boolean
        """

-        status, json_data = getSynchronous(self._settings["host"], self._port, "version",
+        status, json_data = getSynchronous(self._settings["protocol"], self._settings["host"], self._port, "version",
                                           timeout=2, user=self._settings["user"], password=self._settings["password"])

        if json_data is None or status != 200:
@@ -495,6 +534,7 @@ class LocalServer(QtCore.QObject):
        """

        if self.localServerProcessIsRunning():
+            self._stopping = True
            log.info("Stopping local server (PID={})".format(self._local_server_process.pid))
            # local server is running, let's stop it
            if self._http_client:
@@ -506,6 +546,7 @@ class LocalServer(QtCore.QObject):
                progress_dialog.exec_()
                if self._local_server_process.returncode is None:
                    self._killLocalServer()
+            self._server_started_by_me = False

    def _killLocalServer(self):
        # the local server couldn't be stopped with the normal procedure
@@ -516,11 +557,11 @@ class LocalServer(QtCore.QObject):
                self._local_server_process.send_signal(signal.SIGINT)
        # If the process is already dead we received a permission error
        # it's a race condition between the timeout and send signal
-        except PermissionError:
+        except (PermissionError, SystemError):
            pass
        try:
-            # wait for the server to stop for maximum 2 seconds
-            self._local_server_process.wait(timeout=2)
+            # wait for the server to stop for maximum x seconds
+            self._local_server_process.wait(timeout=60)
        except subprocess.TimeoutExpired:
            proceed = QtWidgets.QMessageBox.question(self.parent(),
                                                     "Local server",
@@ -553,5 +594,6 @@ def main():
    local_server.localServerAutoStart()
    local_server.stopLocalServer()

+
 if __name__ == '__main__':
    main()
--- a/gns3/local_server_config.py
+++ b/gns3/local_server_config.py
@@ -110,6 +110,8 @@ class LocalServerConfig:
                settings[name] = self._config[section].getfloat(name, default)
            else:
                settings[name] = self._config[section].get(name, default)
+                if settings[name] == "None":
+                    settings[name] = None

        # sync with the config file
        self.saveSettings(section, settings)
--- a/gns3/logger.py
+++ b/gns3/logger.py
@@ -85,14 +85,33 @@ class ColouredStreamHandler(logging.StreamHandler):
 def init_logger(level, logfile, quiet=False):
    if sys.platform.startswith("win"):
        stream_handler = logging.StreamHandler(sys.stdout)
-        stream_handler.formatter = ColouredFormatter("{asctime} {levelname} {filename}:{lineno} {message}", "%Y-%m-%d %H:%M:%S", "{")
+        stream_handler.formatter = ColouredFormatter("{asctime} {levelname} {name}:{lineno} {message}", "%Y-%m-%d %H:%M:%S", "{")
    else:
        stream_handler = ColouredStreamHandler(sys.stdout)
-        stream_handler.formatter = ColouredFormatter("{asctime} {levelname} {filename}:{lineno}#RESET# {message}", "%Y-%m-%d %H:%M:%S", "{")
+        stream_handler.formatter = ColouredFormatter("{asctime} {levelname} {name}:{lineno}#RESET# {message}", "%Y-%m-%d %H:%M:%S", "{")
    logging.basicConfig(level=level, handlers=[stream_handler])
    log = logging.getLogger()
    log.addHandler(stream_handler)

+    log_factory = logging.getLogRecordFactory()
+
+    def factory(name, level, fn, lno, msg, args, exc_info, func=None, sinfo=None, **kwargs):
+        """
+        Reformat the log message to get something more clean
+        """
+        # When qt message box is display the correct line number is a part of
+        # the name
+        if ":" in name:
+            name, lno = name.split(":")
+            lno = int(lno)
+        name = name.replace("gns3.", "")
+        try:
+            return log_factory(name, level, fn, lno, msg, args, exc_info, func=func, sinfo=sinfo, **kwargs)
+        except Exception as e:  # To avoid recursion we just print the message if something is wrong when logging
+            print(msg)
+            return
+    logging.setLogRecordFactory(factory)
+
    try:
        try:
            os.makedirs(os.path.dirname(logfile))
--- a/gns3/main.py
+++ b/gns3/main.py
@@ -48,7 +48,7 @@ import signal
 import psutil

 try:
-    from gns3.qt import QtCore, QtGui, QtWidgets
+    from gns3.qt import QtCore, QtWidgets
 except ImportError:
    raise SystemExit("Can't import Qt modules: Qt and/or PyQt is probably not installed correctly...")
 from gns3.main_window import MainWindow
@@ -60,7 +60,6 @@ from gns3.application import Application
 from gns3.utils import parse_version
 from gns3.dialogs.profile_select import ProfileSelectDialog

-
 import logging
 log = logging.getLogger(__name__)

@@ -120,11 +119,15 @@ def main():
    parser.add_argument("project", help="load a GNS3 project (.gns3)", metavar="path", nargs="?")
    parser.add_argument("--version", help="show the version", action="version", version=__version__)
    parser.add_argument("--debug", help="print out debug messages", action="store_true", default=False)
+    parser.add_argument("-q", "--quiet", action="store_true", help="do not show logs on stdout")
    parser.add_argument("--config", help="Configuration file")
    parser.add_argument("--profile", help="Settings profile (blank will use default settings files)")
    options = parser.parse_args()
    exception_file_path = "exceptions.log"

+    if options.project:
+        options.project = os.path.abspath(options.project)
+
    if hasattr(sys, "frozen"):
        # We add to the path where the OS search executable our binary location starting by GNS3
        # packaged binary
@@ -144,7 +147,6 @@ def main():
        os.environ["PATH"] = os.pathsep.join(frozen_dirs) + os.pathsep + os.environ.get("PATH", "")

        if options.project:
-            options.project = os.path.abspath(options.project)
            os.chdir(frozen_dir)

    def exceptionHook(exception, value, tb):
@@ -178,10 +180,6 @@ def main():
    # catch exceptions to write them in a file
    sys.excepthook = exceptionHook

-    current_year = datetime.date.today().year
-    print("GNS3 GUI version {}".format(__version__))
-    print("Copyright (c) 2007-{} GNS3 Technologies Inc.".format(current_year))
-
    # we only support Python 3 version >= 3.4
    if sys.version_info < (3, 4):
        raise SystemExit("Python 3.4 or higher is required")
@@ -222,11 +220,12 @@ def main():
            except win32console.error as e:
                print("warning: could not allocate console: {}".format(e))

-    global app
-    app = Application(sys.argv)
-
    local_config = LocalConfig.instance()
-    if local_config.multiProfiles():
+
+    global app
+    app = Application(sys.argv, hdpi=local_config.hdpi())
+
+    if local_config.multiProfiles() and not options.profile:
        profile_select = ProfileSelectDialog()
        profile_select.show()
        profile_select.exec_()
@@ -237,16 +236,23 @@ def main():
        local_config.setConfigFilePath(options.config)
    elif options.profile:
        local_config.setProfile(options.profile)
-    profile = options.profile

    # save client logging info to a file
    logfile = os.path.join(LocalConfig.instance().configDirectory(), "gns3_gui.log")

    # on debug enable logging to stdout
    if options.debug:
-        root_logger = init_logger(logging.DEBUG, logfile)
+        init_logger(logging.DEBUG, logfile)
+    elif options.quiet:
+        init_logger(logging.ERROR, logfile)
    else:
-        root_logger = init_logger(logging.INFO, logfile)
+        init_logger(logging.INFO, logfile)
+
+    current_year = datetime.date.today().year
+    log.info("GNS3 GUI version {}".format(__version__))
+    log.info("Copyright (c) 2007-{} GNS3 Technologies Inc.".format(current_year))
+
+    log.info("Application started with {}".format("".join(sys.argv)))

    # update the exception file path to have it in the same directory as the settings file.
    exception_file_path = os.path.join(LocalConfig.instance().configDirectory(), exception_file_path)
--- a/gns3/main_window.py
+++ b/gns3/main_window.py
@@ -41,11 +41,9 @@ from .dialogs.doctor_dialog import DoctorDialog
 from .dialogs.edit_project_dialog import EditProjectDialog
 from .dialogs.setup_wizard import SetupWizard
 from .settings import GENERAL_SETTINGS
-from .utils.progress_dialog import ProgressDialog
 from .items.node_item import NodeItem
 from .items.link_item import LinkItem
 from .items.shape_item import ShapeItem
-from .items.image_item import ImageItem
 from .topology import Topology
 from .http_client import HTTPClient
 from .progress import Progress
@@ -92,10 +90,10 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        self._open_project_path = None
        self._loadSettings()
        self._connections()
-        self._max_recent_files = 5
+        self._maxrecent_files = 5
        self._project_dialog = None
-        self._recent_file_actions = []
-        self._recent_project_actions = []
+        self.recent_file_actions = []
+        self.recent_project_actions = []
        self._start_time = time.time()
        local_config = LocalConfig.instance()
        local_config.config_changed_signal.connect(self._localConfigChangedSlot)
@@ -112,7 +110,9 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        self.uiDocksMenu.addAction(self.uiTopologySummaryDockWidget.toggleViewAction())
        self.uiDocksMenu.addAction(self.uiComputeSummaryDockWidget.toggleViewAction())
        self.uiDocksMenu.addAction(self.uiConsoleDockWidget.toggleViewAction())
-        self.uiDocksMenu.addAction(self.uiNodesDockWidget.toggleViewAction())
+        action = self.uiNodesDockWidget.toggleViewAction()
+        action.setIconText("All devices")
+        self.uiDocksMenu.addAction(action)

        # make sure the dock widget is not open
        self.uiNodesDockWidget.setVisible(False)
@@ -124,28 +124,25 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        self._pictures_dir = QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.PicturesLocation)

        # add recent file actions to the File menu
-        for i in range(0, self._max_recent_files):
+        for i in range(0, self._maxrecent_files):
            action = QtWidgets.QAction(self.uiFileMenu)
            action.setVisible(False)
            action.triggered.connect(self.openRecentFileSlot)
-            self._recent_file_actions.append(action)
-        self.uiFileMenu.insertActions(self.uiQuitAction, self._recent_file_actions)
-        self._recent_file_actions_separator = self.uiFileMenu.insertSeparator(self.uiQuitAction)
-        self._recent_file_actions_separator.setVisible(False)
+            self.recent_file_actions.append(action)
+        self.uiFileMenu.insertActions(self.uiQuitAction, self.recent_file_actions)
+        self.recent_file_actions_separator = self.uiFileMenu.insertSeparator(self.uiQuitAction)
+        self.recent_file_actions_separator.setVisible(False)
        self.updateRecentFileActions()

-        # add recent file actions to the File menu
-        for i in range(0, self._max_recent_files):
-            action = QtWidgets.QAction(self.uiProjectMenu)
+        # add recent projects to the File menu
+        for i in range(0, self._maxrecent_files):
+            action = QtWidgets.QAction(self.uiFileMenu)
            action.setVisible(False)
            action.triggered.connect(self.openRecentProjectSlot)
-            self._recent_project_actions.append(action)
-        self._recent_project_actions_separator = self.uiProjectMenu.addSeparator()
-        self._recent_project_actions_separator.setVisible(False)
-
-        self.uiProjectMenu.addActions(self._recent_project_actions)
-
-        self.updateRecentProjectActions()
+            self.recent_project_actions.append(action)
+        self.recent_project_actions_separator = self.uiFileMenu.addSeparator()
+        self.recent_project_actions_separator.setVisible(False)
+        self.uiFileMenu.addActions(self.recent_project_actions)

        # set the window icon
        self.setWindowIcon(QtGui.QIcon(":/images/gns3.ico"))
@@ -216,6 +213,9 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        self.uiShowPortNamesAction.triggered.connect(self._showPortNamesActionSlot)
        self.uiShowGridAction.triggered.connect(self._showGridActionSlot)

+        # tool menu connections
+        self.uiWebInterfaceAction.triggered.connect(self._openWebInterfaceActionSlot)
+
        # control menu connections
        self.uiStartAllAction.triggered.connect(self._startAllActionSlot)
        self.uiSuspendAllAction.triggered.connect(self._suspendAllActionSlot)
@@ -291,6 +291,10 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        # save the settings
        LocalConfig.instance().saveSectionSettings(self.__class__.__name__, self._settings)

+    def _openWebInterfaceActionSlot(self):
+        if Controller.instance().connected():
+            QtGui.QDesktopServices.openUrl(QtCore.QUrl(Controller.instance().httpClient().fullUrl()))
+
    def _showGridActionSlot(self):
        """
        Called when we ask to display the grid
@@ -386,7 +390,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        """

        action = self.sender()
-        if action:
+        if action and action.data():
            if len(action.data()) == 2:
                project_id, project_path = action.data()
                Topology.instance().createLoadProject({
@@ -413,6 +417,9 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        if path.endswith(".gns3project") or path.endswith(".gns3p"):
            # Portable GNS3 project
            Topology.instance().importProject(path)
+        elif path.endswith(".net"):
+            QtWidgets.QMessageBox.critical(self, "Open project", "Importing legacy project is not supported in 2.0.\nYou must open it using GNS3 1.x in order to convert it or manually run the gns3 converter.")
+            return

        elif path.endswith(".gns3appliance") or path.endswith(".gns3a"):
            # GNS3 appliance
@@ -423,16 +430,28 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
                return
            self._appliance_wizard.show()
            self._appliance_wizard.exec_()
-        else:
+        elif path.endswith(".gns3"):
            if Controller.instance().isRemote():
-                QtWidgets.QMessageBox.critical(self, "Project", "You can't remote open a .gns3 please use import / export in order to provide to the remote server the full project")
+                QtWidgets.QMessageBox.critical(self, "Open project", "Cannot open a .gns3 file on a remote server, please use a portable project (.gns3p) instead")
                return
-            Topology.instance().loadProject(path)
+            else:
+                Topology.instance().loadProject(path)
+        else:
+            try:
+                extension = path.split('.')[1]
+                QtWidgets.QMessageBox.critical(self, "File open", "Unsupported file extension {} for {}".format(extension, path))
+            except IndexError:
+                QtWidgets.QMessageBox.critical(self, "File open", "Missing file extension for {}".format(path))

-    def _projectChangedSlot(self):
+    @qslot
+    def _projectChangedSlot(self, *args):
        """
        Called when a project finish to load
        """
+        project = Topology.instance().project()
+        if project is not None and self._project_dialog:
+            self._project_dialog.reject()
+            self._project_dialog = None
        self._refreshVisibleWidgets()

    def _refreshVisibleWidgets(self):
@@ -646,7 +665,6 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        """
        Slot called when starting all the nodes.
        """
-
        project = Topology.instance().project()
        if project is not None:
            project.start_all_nodes()
@@ -761,7 +779,10 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        with Progress.instance().context(min_duration=0):
            setup_wizard = SetupWizard(self)
            setup_wizard.show()
-            if setup_wizard.exec_():
+            res = setup_wizard.exec_()
+            # start and connect to the local server if needed
+            LocalServer.instance().localServerAutoStartIfRequire()
+            if res:
                self._newApplianceActionSlot()

    def _aboutQtActionSlot(self):
@@ -926,21 +947,9 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        log.debug("Close the Main Window")
        self._analytics_client.sendScreenView("Main Window", session_start=False)

-        project = Topology.instance().project()
-        if not project:
-            self._finish_application_closing(close_windows=False)
-            event.accept()
-            self.uiConsoleTextEdit.closeIO()
-        elif project.closed() or not project.autoClose():
-            log.debug("Project is closed killing server and closing main windows")
-            self._finish_application_closing(close_windows=False)
-            event.accept()
-            self.uiConsoleTextEdit.closeIO()
-        else:
-            log.debug("Project is not closed asking for project closing")
-            project.project_closed_signal.connect(self._finish_application_closing)
-            project.close(local_server_shutdown=True)
-            event.ignore()
+        self._finish_application_closing(close_windows=False)
+        event.accept()
+        self.uiConsoleTextEdit.closeIO()

    def _finish_application_closing(self, close_windows=True):
        """
@@ -988,7 +997,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
            reply = QtWidgets.QMessageBox.warning(self, "GNS3", "Another GNS3 GUI is already running. Continue?",
                                                  QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No)
            if reply == QtWidgets.QMessageBox.No:
-                self.close()
+                sys.exit(1)
                return

        if not sys.platform.startswith("win") and os.geteuid() == 0:
@@ -1003,9 +1012,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        self._setStyle(self._settings.get("style"))

        Controller.instance().connected_signal.connect(self._controllerConnectedSlot)
-
-        # start and connect to the local server if needed
-        LocalServer.instance().localServerAutoStartIfRequire()
+        Controller.instance().project_list_updated_signal.connect(self.updateRecentProjectActions)

        self._analytics_client.sendScreenView("Main Window")
        self.uiGraphicsView.setEnabled(False)
@@ -1014,10 +1021,12 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        if not self._settings["hide_setup_wizard"]:
            self._setupWizardActionSlot()
        else:
+            # start and connect to the local server if needed
+            LocalServer.instance().localServerAutoStartIfRequire()
            if self._open_file_at_startup:
                self.loadPath(self._open_file_at_startup)
                self._open_file_at_startup = None
-            else:
+            elif Topology.instance().project() is None:
                self._newProjectActionSlot()

        if self._settings["check_for_update"]:
@@ -1058,7 +1067,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
                pass

        recent_projects.insert(0, key)
-        if len(recent_projects) > self._max_recent_files:
+        if len(recent_projects) > self._maxrecent_files:
            recent_projects.pop()

        # write the recent file list
@@ -1079,21 +1088,32 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
            except ValueError:  # Compatible with 2.0.0a1
                project_path = None
                project_id, project_name = project.split(":", maxsplit=1)
-            action = self._recent_project_actions[index]
+
+            if project_id not in [p["project_id"] for p in Controller.instance().projects()]:
+                size -= 1
+                continue
+
+            action = self.recent_project_actions[index]
            if project_path and os.path.exists(project_path):
                action.setText(" {}. {} [{}]".format(index + 1, project_name, project_path))
                action.setData((project_id, project_path, ))
            else:
                action.setText(" {}. {}".format(index + 1, project_name))
                action.setData((project_id, ))
-            action.setVisible(True)
            index += 1

-        for index in range(size + 1, self._max_recent_files):
-            self._recent_project_actions[index].setVisible(False)
+        if Controller.instance().isRemote():
+            for index in range(0, size):
+                self.recent_project_actions[index].setVisible(True)
+            for index in range(size + 1, self._maxrecent_files):
+                self.recent_project_actions[index].setVisible(False)

-        if size:
-            self._recent_project_actions_separator.setVisible(True)
+            if size:
+                self.recent_project_actions_separator.setVisible(True)
+        else:
+            for action in self.recent_project_actions:
+                action.setVisible(False)
+            self.recent_project_actions_separator.setVisible(False)

    def updateRecentFileSettings(self, path):
        """
@@ -1113,7 +1133,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        if path in recent_files:
            recent_files.remove(path)
        recent_files.insert(0, path)
-        if len(recent_files) > self._max_recent_files:
+        if len(recent_files) > self._maxrecent_files:
            recent_files.pop()

        # write the recent file list
@@ -1130,7 +1150,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        for file_path in self._settings["recent_files"]:
            try:
                if file_path and os.path.exists(file_path):
-                    action = self._recent_file_actions[index]
+                    action = self.recent_file_actions[index]
                    action.setText(" {}. {}".format(index + 1, os.path.basename(file_path)))
                    action.setData(file_path)
                    action.setVisible(True)
@@ -1141,15 +1161,15 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
                pass

        if not Controller.instance().isRemote():
-            for index in range(size + 1, self._max_recent_files):
-                self._recent_file_actions[index].setVisible(False)
+            for index in range(size + 1, self._maxrecent_files):
+                self.recent_file_actions[index].setVisible(False)

            if size:
-                self._recent_file_actions_separator.setVisible(True)
+                self.recent_file_actions_separator.setVisible(True)
        else:
-            for index in range(0, self._max_recent_files):
-                self._recent_file_actions[index].setVisible(False)
-            self._recent_file_actions_separator.setVisible(False)
+            for index in range(0, self._maxrecent_files):
+                self.recent_file_actions[index].setVisible(False)
+            self.recent_file_actions_separator.setVisible(False)

    def _controllerConnectedSlot(self):
        self.updateRecentFileActions()
@@ -1186,11 +1206,15 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
            Topology.instance().importProject(path)

    def _editProjectActionSlot(self):
+        if Topology.instance().project() is None:
+            return
        dialog = EditProjectDialog(self)
        dialog.show()
        dialog.exec_()

    def _deleteProjectActionSlot(self):
+        if Topology.instance().project() is None:
+            return
        reply = QtWidgets.QMessageBox.warning(
            self,
            "GNS3",
--- a/gns3/modules/builtin/init.py
+++ b/gns3/modules/builtin/init.py
@@ -240,22 +240,26 @@ class Builtin(Module):
        if isinstance(node, Cloud):
            for key, info in self._cloud_nodes.items():
                if node_name == info["name"]:
-                    node.create(ports=info["ports_mapping"], default_name_format=info["default_name_format"])
+                    default_name_format = info["default_name_format"].replace('{name}', node_name)
+                    node.create(ports=info["ports_mapping"], default_name_format=default_name_format)
                    return
        elif isinstance(node, Nat):
            for key, info in self._nat_nodes.items():
                if node_name == info["name"]:
-                    node.create(default_name_format=info["default_name_format"])
+                    default_name_format = info["default_name_format"].replace('{name}', node_name)
+                    node.create(default_name_format=default_name_format)
                    return
        elif isinstance(node, EthernetHub):
            for key, info in self._ethernet_hubs.items():
                if node_name == info["name"]:
-                    node.create(ports=info["ports_mapping"], default_name_format=info["default_name_format"])
+                    default_name_format = info["default_name_format"].replace('{name}', node_name)
+                    node.create(ports=info["ports_mapping"], default_name_format=default_name_format)
                    return
        elif isinstance(node, EthernetSwitch):
            for key, info in self._ethernet_switches.items():
                if node_name == info["name"]:
-                    node.create(ports=info["ports_mapping"], default_name_format=info["default_name_format"])
+                    default_name_format = info["default_name_format"].replace('{name}', node_name)
+                    node.create(ports=info["ports_mapping"], default_name_format=default_name_format)
                    return
        node.create()

@@ -334,7 +338,7 @@ class Builtin(Module):
                 "symbol": node_class.defaultSymbol(),
                 "builtin": True,
                 "node_type": node_class.URL_PREFIX
-                }
+                 }
            )

        # add custom cloud node templates
--- a/gns3/modules/builtin/dialogs/cloud_wizard.py
+++ b/gns3/modules/builtin/dialogs/cloud_wizard.py
@@ -37,7 +37,7 @@ class CloudWizard(VMWizard, Ui_CloudNodeWizard):

    def __init__(self, cloud_nodes, parent):

-        super().__init__(cloud_nodes, Builtin.instance().settings()["use_local_server"], parent)
+        super().__init__(cloud_nodes, parent)

        self.setPixmap(QtWidgets.QWizard.LogoPixmap, QtGui.QPixmap(":/symbols/cloud.svg"))
        self.uiNameWizardPage.registerField("name*", self.uiNameLineEdit)
--- a/gns3/modules/builtin/dialogs/ethernet_hub_wizard.py
+++ b/gns3/modules/builtin/dialogs/ethernet_hub_wizard.py
@@ -37,7 +37,7 @@ class EthernetHubWizard(VMWizard, Ui_EthernetHubWizard):

    def __init__(self, ethernet_hubs, parent):

-        super().__init__(ethernet_hubs, Builtin.instance().settings()["use_local_server"], parent)
+        super().__init__(ethernet_hubs, parent)

        self.setPixmap(QtWidgets.QWizard.LogoPixmap, QtGui.QPixmap(":/symbols/hub.svg"))
        self.uiNameWizardPage.registerField("name*", self.uiNameLineEdit)
@@ -50,7 +50,7 @@ class EthernetHubWizard(VMWizard, Ui_EthernetHubWizard):
        """

        ports = []
-        for port_number in range(1, self.uiPortsSpinBox.value() + 1):
+        for port_number in range(0, self.uiPortsSpinBox.value()):
            ports.append({"port_number": int(port_number),
                          "name": "Ethernet{}".format(port_number)})

--- a/gns3/modules/builtin/dialogs/ethernet_switch_wizard.py
+++ b/gns3/modules/builtin/dialogs/ethernet_switch_wizard.py
@@ -37,7 +37,7 @@ class EthernetSwitchWizard(VMWizard, Ui_EthernetSwitchWizard):

    def __init__(self, ethernet_switches, parent):

-        super().__init__(ethernet_switches, Builtin.instance().settings()["use_local_server"], parent)
+        super().__init__(ethernet_switches, parent)

        self.setPixmap(QtWidgets.QWizard.LogoPixmap, QtGui.QPixmap(":/symbols/ethernet_switch.svg"))
        self.uiNameWizardPage.registerField("name*", self.uiNameLineEdit)
@@ -50,7 +50,7 @@ class EthernetSwitchWizard(VMWizard, Ui_EthernetSwitchWizard):
        """

        ports = []
-        for port_number in range(1, self.uiPortsSpinBox.value() + 1):
+        for port_number in range(0, self.uiPortsSpinBox.value()):
            ports.append({"port_number": int(port_number),
                          "name": "Ethernet{}".format(port_number),
                          "type": "access",
--- a/gns3/modules/builtin/ethernet_hub.py
+++ b/gns3/modules/builtin/ethernet_hub.py
@@ -98,7 +98,7 @@ class EthernetHub(Node):
 """.format(name=self.name(),
           id=self.id(),
           node_id=self._node_id,
-           host=self.compute().id())
+           host=self.compute().name())

        port_info = ""
        for port in self._ports:
--- a/gns3/modules/builtin/ethernet_switch.py
+++ b/gns3/modules/builtin/ethernet_switch.py
@@ -98,7 +98,7 @@ class EthernetSwitch(Node):
 """.format(name=self.name(),
           id=self.id(),
           node_id=self._node_id,
-           host=self.compute().id())
+           host=self.compute().name())

        port_info = ""
        for port in self._ports:
@@ -126,7 +126,7 @@ class EthernetSwitch(Node):
                                                                                                                                    port_ethertype_info=port_ethertype_info,
                                                                                                                                    port_vlan_info=port_vlan_info)
                        port_info += "    {port_description}\n".format(port_description=port.description())
-                    break
+                        break

        return info + port_info

--- a/gns3/modules/builtin/pages/builtin_preferences_page.py
+++ b/gns3/modules/builtin/pages/builtin_preferences_page.py
@@ -47,8 +47,6 @@ class BuiltinPreferencesPage(QtWidgets.QWidget, Ui_BuiltinPreferencesPageWidget)
        :param settings: Built-in settings
        """

-        self.uiUseLocalServercheckBox.setChecked(settings["use_local_server"])
-
    def loadPreferences(self):
        """Loads Built-in preferences."""

@@ -59,5 +57,4 @@ class BuiltinPreferencesPage(QtWidgets.QWidget, Ui_BuiltinPreferencesPageWidget)
        """Saves Built-in preferences."""

        new_settings = {}
-        new_settings["use_local_server"] = self.uiUseLocalServercheckBox.isChecked()
        Builtin.instance().setSettings(new_settings)
--- 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.
--- a/gns3/modules/builtin/pages/cloud_preferences_page.py
+++ b/gns3/modules/builtin/pages/cloud_preferences_page.py
@@ -69,7 +69,10 @@ class CloudPreferencesPage(QtWidgets.QWidget, Ui_CloudPreferencesPageWidget):
        section_item = self._createSectionItem("General")
        QtWidgets.QTreeWidgetItem(section_item, ["Template name:", cloud_node["name"]])
        QtWidgets.QTreeWidgetItem(section_item, ["Default name format:", cloud_node["default_name_format"]])
-        QtWidgets.QTreeWidgetItem(section_item, ["Server:", ComputeManager.instance().getCompute(cloud_node["server"]).name()])
+        try:
+            QtWidgets.QTreeWidgetItem(section_item, ["Server:", ComputeManager.instance().getCompute(cloud_node["server"]).name()])
+        except KeyError:
+            pass

        self.uiCloudNodeInfoTreeWidget.expandAll()
        self.uiCloudNodeInfoTreeWidget.resizeColumnToContents(0)
--- 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
@@ -146,7 +146,7 @@ class EthernetHubConfigurationPage(QtWidgets.QWidget, Ui_ethernetHubConfigPageWi
            settings["category"] = self.uiCategoryComboBox.itemData(self.uiCategoryComboBox.currentIndex())

        settings["ports_mapping"] = []
-        for port_number in range(1, nb_ports + 1):
+        for port_number in range(0, nb_ports):
            settings["ports_mapping"].append({"port_number": int(port_number),
-                                      "name": "Ethernet{}".format(port_number)})
+                                              "name": "Ethernet{}".format(port_number)})
        return settings
--- a/gns3/modules/builtin/pages/ethernet_hub_preferences_page.py
+++ b/gns3/modules/builtin/pages/ethernet_hub_preferences_page.py
@@ -70,7 +70,10 @@ class EthernetHubPreferencesPage(QtWidgets.QWidget, Ui_EthernetHubPreferencesPag
        section_item = self._createSectionItem("General")
        QtWidgets.QTreeWidgetItem(section_item, ["Template name:", ethernet_hub["name"]])
        QtWidgets.QTreeWidgetItem(section_item, ["Default name format:", ethernet_hub["default_name_format"]])
-        QtWidgets.QTreeWidgetItem(section_item, ["Server:", ComputeManager.instance().getCompute(ethernet_hub["server"]).name()])
+        try:
+            QtWidgets.QTreeWidgetItem(section_item, ["Server:", ComputeManager.instance().getCompute(ethernet_hub["server"]).name()])
+        except KeyError:
+            pass
        QtWidgets.QTreeWidgetItem(section_item, ["Number of ports:", str(len(ethernet_hub["ports_mapping"]))])

        self.uiEthernetHubInfoTreeWidget.expandAll()
--- 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

--- a/gns3/modules/builtin/pages/ethernet_switch_preferences_page.py
+++ b/gns3/modules/builtin/pages/ethernet_switch_preferences_page.py
@@ -70,7 +70,10 @@ class EthernetSwitchPreferencesPage(QtWidgets.QWidget, Ui_EthernetSwitchPreferen
        section_item = self._createSectionItem("General")
        QtWidgets.QTreeWidgetItem(section_item, ["Template name:", ethernet_switch["name"]])
        QtWidgets.QTreeWidgetItem(section_item, ["Default name format:", ethernet_switch["default_name_format"]])
-        QtWidgets.QTreeWidgetItem(section_item, ["Server:", ComputeManager.instance().getCompute(ethernet_switch["server"]).name()])
+        try:
+            QtWidgets.QTreeWidgetItem(section_item, ["Server:", ComputeManager.instance().getCompute(ethernet_switch["server"]).name()])
+        except KeyError:
+            pass

        for port in ethernet_switch["ports_mapping"]:
            section_item = self._createSectionItem("Port{}".format(port["port_number"]))
@@ -134,7 +137,7 @@ class EthernetSwitchPreferencesPage(QtWidgets.QWidget, Ui_EthernetSwitchPreferen
            dialog.show()
            if dialog.exec_():
                # update the icon
-                Controller.instance().getSymbolIcon(ethernet_switches["symbol"], qpartial(self._setItemIcon, item))
+                Controller.instance().getSymbolIcon(ethernet_switch["symbol"], qpartial(self._setItemIcon, item))
                if ethernet_switch["name"] != item.text(0):
                    new_key = "{server}:{name}".format(server=ethernet_switch["server"], name=ethernet_switch["name"])
                    if new_key in self._ethernet_switches:
--- a/gns3/modules/builtin/settings.py
+++ b/gns3/modules/builtin/settings.py
@@ -22,7 +22,6 @@ Default Built-in settings.
 from gns3.node import Node

 BUILTIN_SETTINGS = {
-    "use_local_server": True,
 }


--- 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>419</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">
--- a/gns3/modules/builtin/ui/atm_switch_configuration_page_ui.py
+++ b/gns3/modules/builtin/ui/atm_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/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.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_atmSwitchConfigPageWidget(object):
-
    def setupUi(self, atmSwitchConfigPageWidget):
        atmSwitchConfigPageWidget.setObjectName("atmSwitchConfigPageWidget")
-        atmSwitchConfigPageWidget.resize(459, 419)
+        atmSwitchConfigPageWidget.resize(459, 430)
        self.gridLayout_2 = QtWidgets.QGridLayout(atmSwitchConfigPageWidget)
        self.gridLayout_2.setObjectName("gridLayout_2")
        self.uiGeneralGroupBox = QtWidgets.QGroupBox(atmSwitchConfigPageWidget)
@@ -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:"))
+
--- a/gns3/modules/builtin/ui/builtin_preferences_page.ui
+++ b/gns3/modules/builtin/ui/builtin_preferences_page.ui
@@ -24,19 +24,9 @@
     </property>
     <widget class="QWidget" name="uiServerSettingsTabWidget">
      <attribute name="title">
-       <string>General settings</string>
+       <string>Local settings</string>
      </attribute>
      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <widget class="QCheckBox" name="uiUseLocalServercheckBox">
-         <property name="text">
-          <string>Use the local server</string>
-         </property>
-         <property name="checked">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
       <item>
        <spacer name="verticalSpacer">
         <property name="orientation">
--- a/gns3/modules/builtin/ui/builtin_preferences_page_ui.py
+++ b/gns3/modules/builtin/ui/builtin_preferences_page_ui.py
@@ -2,7 +2,7 @@

 # Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/modules/builtin/ui/builtin_preferences_page.ui'
 #
-# Created: Thu Jun  9 21:08:46 2016
+# Created: Wed Dec  7 21:40:18 2016
 #      by: PyQt5 UI code generator 5.2.1
 #
 # WARNING! All changes made in this file will be lost!
@@ -22,10 +22,6 @@ class Ui_BuiltinPreferencesPageWidget(object):
        self.uiServerSettingsTabWidget.setObjectName("uiServerSettingsTabWidget")
        self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.uiServerSettingsTabWidget)
        self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.uiUseLocalServercheckBox = QtWidgets.QCheckBox(self.uiServerSettingsTabWidget)
-        self.uiUseLocalServercheckBox.setChecked(True)
-        self.uiUseLocalServercheckBox.setObjectName("uiUseLocalServercheckBox")
-        self.verticalLayout_2.addWidget(self.uiUseLocalServercheckBox)
        spacerItem = QtWidgets.QSpacerItem(20, 5, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
        self.verticalLayout_2.addItem(spacerItem)
        self.uiTabWidget.addTab(self.uiServerSettingsTabWidget, "")
@@ -46,7 +42,6 @@ class Ui_BuiltinPreferencesPageWidget(object):
    def retranslateUi(self, BuiltinPreferencesPageWidget):
        _translate = QtCore.QCoreApplication.translate
        BuiltinPreferencesPageWidget.setWindowTitle(_translate("BuiltinPreferencesPageWidget", "Built-in"))
-        self.uiUseLocalServercheckBox.setText(_translate("BuiltinPreferencesPageWidget", "Use the local server"))
-        self.uiTabWidget.setTabText(self.uiTabWidget.indexOf(self.uiServerSettingsTabWidget), _translate("BuiltinPreferencesPageWidget", "General settings"))
+        self.uiTabWidget.setTabText(self.uiTabWidget.indexOf(self.uiServerSettingsTabWidget), _translate("BuiltinPreferencesPageWidget", "Local settings"))
        self.uiRestoreDefaultsPushButton.setText(_translate("BuiltinPreferencesPageWidget", "Restore defaults"))

--- 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">
--- 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"))
--- a/gns3/modules/builtin/ui/ethernet_switch_configuration_page.ui
+++ b/gns3/modules/builtin/ui/ethernet_switch_configuration_page.ui
@@ -105,13 +105,13 @@
         </sizepolicy>
        </property>
        <property name="minimum">
-         <number>1</number>
+         <number>0</number>
        </property>
        <property name="maximum">
         <number>65535</number>
        </property>
        <property name="value">
-         <number>1</number>
+         <number>0</number>
        </property>
       </widget>
      </item>
--- a/gns3/modules/builtin/ui/ethernet_switch_configuration_page_ui.py
+++ b/gns3/modules/builtin/ui/ethernet_switch_configuration_page_ui.py
@@ -1,15 +1,16 @@
 # -*- coding: utf-8 -*-

-# Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/modules/builtin/ui/ethernet_switch_configuration_page.ui'
+# Form implementation generated from reading ui file '/Users/noplay/code/gns3/gns3-gui/gns3/modules/builtin/ui/ethernet_switch_configuration_page.ui'
 #
-# Created: Fri Jun 10 20:45:43 2016
-#      by: PyQt5 UI code generator 5.2.1
+# Created by: PyQt5 UI code generator 5.6
 #
 # WARNING! All changes made in this file will be lost!

 from PyQt5 import QtCore, QtGui, QtWidgets

+
 class Ui_ethernetSwitchConfigPageWidget(object):
+
    def setupUi(self, ethernetSwitchConfigPageWidget):
        ethernetSwitchConfigPageWidget.setObjectName("ethernetSwitchConfigPageWidget")
        ethernetSwitchConfigPageWidget.resize(545, 435)
@@ -69,9 +70,9 @@ class Ui_ethernetSwitchConfigPageWidget(object):
        sizePolicy.setVerticalStretch(0)
        sizePolicy.setHeightForWidth(self.uiPortSpinBox.sizePolicy().hasHeightForWidth())
        self.uiPortSpinBox.setSizePolicy(sizePolicy)
-        self.uiPortSpinBox.setMinimum(1)
+        self.uiPortSpinBox.setMinimum(0)
        self.uiPortSpinBox.setMaximum(65535)
-        self.uiPortSpinBox.setProperty("value", 1)
+        self.uiPortSpinBox.setProperty("value", 0)
        self.uiPortSpinBox.setObjectName("uiPortSpinBox")
        self.gridlayout.addWidget(self.uiPortSpinBox, 0, 1, 1, 1)
        self.label_3 = QtWidgets.QLabel(self.uiEthernetSwitchSettingsGroupBox)
@@ -174,4 +175,3 @@ class Ui_ethernetSwitchConfigPageWidget(object):
        self.uiPortsTreeWidget.headerItem().setText(3, _translate("ethernetSwitchConfigPageWidget", "EtherType"))
        self.uiAddPushButton.setText(_translate("ethernetSwitchConfigPageWidget", "&Add"))
        self.uiDeletePushButton.setText(_translate("ethernetSwitchConfigPageWidget", "&Delete"))
-
--- 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">
--- 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"))
+
--- a/gns3/modules/docker/init.py
+++ b/gns3/modules/docker/init.py
@@ -158,8 +158,7 @@ class Docker(Module):
        if not image:
            selected_images = []
            for image, info in self._docker_containers.items():
-                if info["server"] == node.server().host() or (
-                        node.server().isLocal() and info["server"] == "local"):
+                if info["server"] == node.compute().id():
                    selected_images.append(image)

            if not selected_images:
--- a/gns3/modules/docker/dialogs/docker_vm_wizard.py
+++ b/gns3/modules/docker/dialogs/docker_vm_wizard.py
@@ -36,7 +36,7 @@ class DockerVMWizard(VMWizard, Ui_DockerVMWizard):

    def __init__(self, docker_containers, parent):

-        super().__init__(docker_containers, Docker.instance().settings()["use_local_server"], parent)
+        super().__init__(docker_containers, parent)
        self._docker_containers = docker_containers
        self.setPixmap(QtWidgets.QWizard.LogoPixmap, QtGui.QPixmap(":/icons/docker.png"))

--- a/gns3/modules/docker/pages/docker_preferences_page.py
+++ b/gns3/modules/docker/pages/docker_preferences_page.py
@@ -40,9 +40,8 @@ class DockerPreferencesPage(QtWidgets.QWidget, Ui_DockerPreferencesPageWidget):
        # connect signals
        self.uiRestoreDefaultsPushButton.clicked.connect(self._restoreDefaultsSlot)

-        if not sys.platform.startswith("linux"):
+        # if not sys.platform.startswith("linux"):
            # Docker is only supported on Linux
-            self.uiUseLocalServercheckBox.setEnabled(False)

    def _restoreDefaultsSlot(self):
        """Slot to populate the page widgets with the default settings."""
@@ -53,7 +52,6 @@ class DockerPreferencesPage(QtWidgets.QWidget, Ui_DockerPreferencesPageWidget):

        :param settings: Docker settings
        """
-        self.uiUseLocalServercheckBox.setChecked(settings["use_local_server"])

    def loadPreferences(self):
        """Loads Docker preferences."""
@@ -63,5 +61,4 @@ class DockerPreferencesPage(QtWidgets.QWidget, Ui_DockerPreferencesPageWidget):
    def savePreferences(self):
        """Saves Docker preferences."""
        new_settings = {}
-        new_settings["use_local_server"] = self.uiUseLocalServercheckBox.isChecked()
        Docker.instance().setSettings(new_settings)
--- 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):

--- a/gns3/modules/docker/pages/docker_vm_preferences_page.py
+++ b/gns3/modules/docker/pages/docker_vm_preferences_page.py
@@ -67,7 +67,10 @@ class DockerVMPreferencesPage(QtWidgets.QWidget, Ui_DockerVMPreferencesPageWidge
        # fill out the General section
        section_item = self._createSectionItem("General")
        QtWidgets.QTreeWidgetItem(section_item, ["Image name:", docker_image["image"]])
-        QtWidgets.QTreeWidgetItem(section_item, ["Server:", ComputeManager.instance().getCompute(docker_image["server"]).name()])
+        try:
+            QtWidgets.QTreeWidgetItem(section_item, ["Server:", ComputeManager.instance().getCompute(docker_image["server"]).name()])
+        except KeyError:
+            pass
        QtWidgets.QTreeWidgetItem(section_item, ["Console type:", str(docker_image["console_type"])])
        QtWidgets.QTreeWidgetItem(section_item, ["Default name format:", docker_image["default_name_format"]])
        QtWidgets.QTreeWidgetItem(section_item, ["Adapters:", str(docker_image["adapters"])])
--- a/gns3/modules/docker/settings.py
+++ b/gns3/modules/docker/settings.py
@@ -23,7 +23,6 @@ import sys
 from gns3.node import Node

 DOCKER_SETTINGS = {
-    "use_local_server": sys.platform.startswith("linux"),  # Docker only supported on Linux
    "containers": []
 }

--- a/gns3/modules/docker/ui/docker_preferences_page.ui
+++ b/gns3/modules/docker/ui/docker_preferences_page.ui
@@ -24,22 +24,12 @@
     </property>
     <widget class="QWidget" name="uiServerSettingsTabWidget">
      <attribute name="title">
-       <string>General settings</string>
+       <string>Local settings</string>
      </attribute>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <property name="margin">
        <number>10</number>
       </property>
-       <item>
-        <widget class="QCheckBox" name="uiUseLocalServercheckBox">
-         <property name="text">
-          <string>Use the local server</string>
-         </property>
-         <property name="checked">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
       <item>
        <spacer name="verticalSpacer">
         <property name="orientation">
--- a/gns3/modules/docker/ui/docker_preferences_page_ui.py
+++ b/gns3/modules/docker/ui/docker_preferences_page_ui.py
@@ -2,7 +2,7 @@

 # Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/modules/docker/ui/docker_preferences_page.ui'
 #
-# Created: Mon Sep 19 11:16:52 2016
+# Created: Wed Dec  7 21:29:40 2016
 #      by: PyQt5 UI code generator 5.2.1
 #
 # WARNING! All changes made in this file will be lost!
@@ -23,10 +23,6 @@ class Ui_DockerPreferencesPageWidget(object):
        self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.uiServerSettingsTabWidget)
        self.verticalLayout_2.setContentsMargins(10, 10, 10, 10)
        self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.uiUseLocalServercheckBox = QtWidgets.QCheckBox(self.uiServerSettingsTabWidget)
-        self.uiUseLocalServercheckBox.setChecked(True)
-        self.uiUseLocalServercheckBox.setObjectName("uiUseLocalServercheckBox")
-        self.verticalLayout_2.addWidget(self.uiUseLocalServercheckBox)
        spacerItem = QtWidgets.QSpacerItem(20, 5, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
        self.verticalLayout_2.addItem(spacerItem)
        self.uiTabWidget.addTab(self.uiServerSettingsTabWidget, "")
@@ -47,7 +43,6 @@ class Ui_DockerPreferencesPageWidget(object):
    def retranslateUi(self, DockerPreferencesPageWidget):
        _translate = QtCore.QCoreApplication.translate
        DockerPreferencesPageWidget.setWindowTitle(_translate("DockerPreferencesPageWidget", "Docker"))
-        self.uiUseLocalServercheckBox.setText(_translate("DockerPreferencesPageWidget", "Use the local server"))
-        self.uiTabWidget.setTabText(self.uiTabWidget.indexOf(self.uiServerSettingsTabWidget), _translate("DockerPreferencesPageWidget", "General settings"))
+        self.uiTabWidget.setTabText(self.uiTabWidget.indexOf(self.uiServerSettingsTabWidget), _translate("DockerPreferencesPageWidget", "Local settings"))
        self.uiRestoreDefaultsPushButton.setText(_translate("DockerPreferencesPageWidget", "Restore defaults"))

--- a/gns3/modules/docker/ui/docker_vm_configuration_page.ui
+++ b/gns3/modules/docker/ui/docker_vm_configuration_page.ui
@@ -24,6 +24,9 @@
       <string>General settings</string>
      </attribute>
      <layout class="QGridLayout" name="gridLayout">
+       <property name="margin">
+        <number>10</number>
+       </property>
       <item row="0" column="1">
        <widget class="QLineEdit" name="uiNameLineEdit"/>
       </item>
--- a/gns3/modules/docker/ui/docker_vm_configuration_page_ui.py
+++ b/gns3/modules/docker/ui/docker_vm_configuration_page_ui.py
@@ -2,7 +2,7 @@

 # Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/modules/docker/ui/docker_vm_configuration_page.ui'
 #
-# Created: Tue May 31 21:37:32 2016
+# Created: Thu Jan  5 14:49:45 2017
 #      by: PyQt5 UI code generator 5.2.1
 #
 # WARNING! All changes made in this file will be lost!
@@ -20,6 +20,7 @@ class Ui_dockerVMConfigPageWidget(object):
        self.tab = QtWidgets.QWidget()
        self.tab.setObjectName("tab")
        self.gridLayout = QtWidgets.QGridLayout(self.tab)
+        self.gridLayout.setContentsMargins(10, 10, 10, 10)
        self.gridLayout.setObjectName("gridLayout")
        self.uiNameLineEdit = QtWidgets.QLineEdit(self.tab)
        self.uiNameLineEdit.setObjectName("uiNameLineEdit")
--- a/gns3/modules/dynamips/dialogs/ios_router_wizard.py
+++ b/gns3/modules/dynamips/dialogs/ios_router_wizard.py
@@ -21,8 +21,10 @@ Wizard for IOS routers.

 import os
 import re
+import uuid

-from gns3.qt import QtCore, QtGui, QtWidgets
+
+from gns3.qt import QtCore, QtGui, QtWidgets, qslot
 from gns3.node import Node
 from gns3.topology import Topology
 from gns3.utils.run_in_terminal import RunInTerminal
@@ -67,7 +69,7 @@ class IOSRouterWizard(VMWithImagesWizard, Ui_IOSRouterWizard):

    def __init__(self, ios_routers, parent):

-        super().__init__(ios_routers, Dynamips.instance().settings()["use_local_server"], parent)
+        super().__init__(ios_routers, parent)
        self.setPixmap(QtWidgets.QWizard.LogoPixmap, QtGui.QPixmap(":/symbols/router.svg"))

        self.uiTestIOSImagePushButton.clicked.connect(self._testIOSImageSlot)
@@ -79,6 +81,10 @@ class IOSRouterWizard(VMWithImagesWizard, Ui_IOSRouterWizard):
        self._router = None
        # Validate the Idle PC value
        self._idle_valid = False
+
+        # True if we have create a temporary project for computing IDLE PC
+        self._project_created = False
+
        idle_pc_rgx = QtCore.QRegExp("^(0x[0-9a-fA-F]{8})?$")
        validator = QtGui.QRegExpValidator(idle_pc_rgx, self)
        self.uiIdlepcLineEdit.setValidator(validator)
@@ -213,6 +219,21 @@ class IOSRouterWizard(VMWithImagesWizard, Ui_IOSRouterWizard):
        """
        Slot for the idle-PC finder.
        """
+        if Topology.instance().project() is None:
+            project = Topology.instance().createLoadProject({"project_name": str(uuid.uuid4())})
+            project.project_updated_signal.connect(self._projectCreatedSlot)
+        else:
+            self._projectCreatedSlot()
+
+    @qslot
+    def _projectCreatedSlot(self, *args):
+        if Topology.instance().project() is None:
+            return
+        try:
+            Topology.instance().project().project_updated_signal.disconnect(self._projectCreatedSlot)
+            self._project_created = True
+        except TypeError:
+            pass  # If the slot is not connected (project already created)

        module = Dynamips.instance()
        platform = self.uiPlatformComboBox.currentText()
@@ -220,9 +241,6 @@ class IOSRouterWizard(VMWithImagesWizard, Ui_IOSRouterWizard):
        ram = self.uiRamSpinBox.value()
        router_class = PLATFORM_TO_CLASS[platform]

-        if Topology.instance().project() is None:
-            QtWidgets.QMessageBox.critical(self, "Idle PC", "You need to create a project before computing Idle PC")
-            return False
        self._router = router_class(module, ComputeManager.instance().getCompute(self._compute_id), Topology.instance().project())
        self._router.create(ios_image, ram, name="AUTOIDLEPC")
        self._router.created_signal.connect(self.createdSlot)
@@ -262,7 +280,8 @@ class IOSRouterWizard(VMWithImagesWizard, Ui_IOSRouterWizard):

        QtWidgets.QMessageBox.critical(self, "Idle-PC finder", "Could not create IOS router: {}".format(message))

-    def _computeAutoIdlepcCallback(self, result, error=False, **kwargs):
+    @qslot
+    def _computeAutoIdlepcCallback(self, result, error=False, *args, **kwargs):
        """
        Callback for computeAutoIdlepc.

@@ -270,7 +289,11 @@ class IOSRouterWizard(VMWithImagesWizard, Ui_IOSRouterWizard):
        :param error: indicates an error (boolean)
        """

-        if self._router:
+        if self._project_created:
+            Topology.instance().deleteProject()
+            self._project_created = False
+            self._router = None
+        elif self._router:
            self._router.delete()
            self._router = None
        if error:
--- a/gns3/modules/dynamips/nodes/router.py
+++ b/gns3/modules/dynamips/nodes/router.py
@@ -24,9 +24,7 @@ import re

 from gns3.node import Node
 from gns3.utils.normalize_filename import normalize_filename
-from gns3.image_manager import ImageManager

-from ..settings import PLATFORMS_DEFAULT_RAM
 from ..adapters import ADAPTER_MATRIX
 from ..wics import WIC_MATRIX

@@ -139,7 +137,7 @@ class Router(Node):
        :param result: server response
        """

-        self._dynamips_id = result["dynamips_id"]
+        self._dynamips_id = result.get("dynamips_id")

    def update(self, new_settings):
        """
@@ -454,15 +452,12 @@ class Router(Node):
        try:
            contents = os.listdir(directory)
        except OSError as e:
-            self.warning_signal.emit(self.id(), "Configuration could not be loaded from directory {}: {}".format(directory, e))
            return
        startup_config = normalize_filename(self.name()) + "_startup-config.cfg"
        private_config = normalize_filename(self.name()) + "_private-config.cfg"
        new_settings = {}
        if startup_config in contents:
            new_settings["startup_config"] = os.path.join(directory, startup_config)
-        else:
-            self.warning_signal.emit(self.id(), "no startup-config file could be found, expected file name: {}".format(startup_config))

        if private_config in contents:
            new_settings["private_config"] = os.path.join(directory, private_config)
--- a/gns3/modules/dynamips/pages/dynamips_preferences_page.py
+++ b/gns3/modules/dynamips/pages/dynamips_preferences_page.py
@@ -43,7 +43,6 @@ class DynamipsPreferencesPage(QtWidgets.QWidget, Ui_DynamipsPreferencesPageWidge
        self.uiDynamipsPathToolButton.clicked.connect(self._dynamipsPathBrowserSlot)
        self.uiGhostIOSSupportCheckBox.stateChanged.connect(self._ghostIOSSupportSlot)
        self.uiRestoreDefaultsPushButton.clicked.connect(self._restoreDefaultsSlot)
-        self.uiUseLocalServercheckBox.stateChanged.connect(self._useLocalServerSlot)

    def _dynamipsPathBrowserSlot(self):
        """
@@ -55,6 +54,8 @@ class DynamipsPreferencesPage(QtWidgets.QWidget, Ui_DynamipsPreferencesPageWidge
            file_filter = "Executable (*.exe);;All files (*.*)"

        dynamips_path = shutil.which("dynamips")
+        if sys.platform.startswith("darwin") and dynamips_path is None:
+            dynamips_path = "/Applications/GNS3.app/Contents/Resources/dynamips"
        path, _ = QtWidgets.QFileDialog.getOpenFileName(self, "Select Dynamips", dynamips_path, file_filter)
        if not path:
            return
@@ -127,7 +128,6 @@ class DynamipsPreferencesPage(QtWidgets.QWidget, Ui_DynamipsPreferencesPageWidge

        self.uiDynamipsPathLineEdit.setText(settings["dynamips_path"])
        self.uiAllocateAuxConsolePortsCheckBox.setChecked(settings["allocate_aux_console_ports"])
-        self.uiUseLocalServercheckBox.setChecked(settings["use_local_server"])
        self.uiGhostIOSSupportCheckBox.setChecked(settings["ghost_ios_support"])
        self.uiMmapSupportCheckBox.setChecked(settings["mmap_support"])
        self.uiSparseMemorySupportCheckBox.setChecked(settings["sparse_memory_support"])
@@ -146,12 +146,11 @@ class DynamipsPreferencesPage(QtWidgets.QWidget, Ui_DynamipsPreferencesPageWidge
        """

        dynamips_path = self.uiDynamipsPathLineEdit.text().strip()
-        if dynamips_path and self.uiUseLocalServercheckBox.isChecked() and not self._checkDynamipsPath(dynamips_path):
+        if dynamips_path and not self._checkDynamipsPath(dynamips_path):
            return

        new_settings = {"dynamips_path": dynamips_path,
                        "allocate_aux_console_ports": self.uiAllocateAuxConsolePortsCheckBox.isChecked(),
-                        "use_local_server": self.uiUseLocalServercheckBox.isChecked(),
                        "ghost_ios_support": self.uiGhostIOSSupportCheckBox.isChecked(),
                        "mmap_support": self.uiMmapSupportCheckBox.isChecked(),
                        "sparse_memory_support": self.uiSparseMemorySupportCheckBox.isChecked()}
--- a/gns3/modules/dynamips/pages/ios_router_configuration_page.py
+++ b/gns3/modules/dynamips/pages/ios_router_configuration_page.py
@@ -188,7 +188,7 @@ class IOSRouterConfigurationPage(QtWidgets.QWidget, Ui_iosRouterConfigPageWidget
            widget.setEnabled(False)

        # load the available adapters to the correct slot for the corresponding platform and chassis
-        for slot_number, slot_adapters in ADAPTER_MATRIX[platform][chassis].items():
+        for slot_number, slot_adapters in ADAPTER_MATRIX[platform].get(chassis, {}).items():
            self._widget_slots[slot_number].setEnabled(True)

            if isinstance(slot_adapters, str):
@@ -204,7 +204,7 @@ class IOSRouterConfigurationPage(QtWidgets.QWidget, Ui_iosRouterConfigPageWidget
                    self._widget_slots[slot_number].addItems([""] + module_list)

            # set the combox box to the correct slot adapter if configured.
-            if settings["slot" + str(slot_number)]:
+            if settings.get("slot" + str(slot_number)):
                index = self._widget_slots[slot_number].findText(settings["slot" + str(slot_number)])
                if index != -1:
                    self._widget_slots[slot_number].setCurrentIndex(index)
@@ -222,7 +222,7 @@ class IOSRouterConfigurationPage(QtWidgets.QWidget, Ui_iosRouterConfigPageWidget
                self._widget_wics[wic_number].addItems([""] + wic_list)

                # set the combox box to the correct WIC if configured.
-                if settings["wic" + str(wic_number)]:
+                if settings.get("wic" + str(wic_number)):
                    index = self._widget_wics[wic_number].findText(settings["wic" + str(wic_number)])
                    if index != -1:
                        self._widget_wics[wic_number].setCurrentIndex(index)
@@ -598,11 +598,11 @@ class IOSRouterConfigurationPage(QtWidgets.QWidget, Ui_iosRouterConfigPageWidget
                if node:
                    settings["slot" + str(slot_number)] = node.settings().get("slot" + str(slot_number))

-                if settings["slot" + str(slot_number)] and settings["slot" + str(slot_number)] != module:
+                if settings.get("slot" + str(slot_number)) and settings.get("slot" + str(slot_number)) != module:
                    if node:
                        self._checkForLinkConnectedToAdapter(slot_number, settings, node)
                settings["slot" + str(slot_number)] = module
-            elif settings["slot" + str(slot_number)]:
+            elif "slot" + str(slot_number) in settings and settings["slot" + str(slot_number)]:
                if node:
                    self._checkForLinkConnectedToAdapter(slot_number, settings, node)
                settings["slot" + str(slot_number)] = ""
@@ -619,7 +619,7 @@ class IOSRouterConfigurationPage(QtWidgets.QWidget, Ui_iosRouterConfigPageWidget
                    if node:
                        self._checkForLinkConnectedToWIC(wic_number, settings, node)
                settings["wic" + str(wic_number)] = wic_name
-            elif settings["wic" + str(wic_number)]:
+            elif "wic" + str(wic_number) in settings and settings["wic" + str(wic_number)]:
                if node:
                    self._checkForLinkConnectedToWIC(wic_number, settings, node)
                settings["wic" + str(wic_number)] = ""
--- a/gns3/modules/dynamips/pages/ios_router_preferences_page.py
+++ b/gns3/modules/dynamips/pages/ios_router_preferences_page.py
@@ -26,7 +26,7 @@ import math
 import zipfile
 import logging

-from gns3.qt import QtCore, QtGui, QtWidgets, qpartial
+from gns3.qt import QtCore, QtGui, QtWidgets, qpartial, qslot
 from gns3.controller import Controller

 from gns3.main_window import MainWindow
@@ -88,7 +88,8 @@ class IOSRouterPreferencesPage(QtWidgets.QWidget, Ui_IOSRouterPreferencesPageWid
        else:
            self.uiIOSRouterInfoTreeWidget.clear()

-    def _iosRouterNewSlot(self):
+    @qslot
+    def _iosRouterNewSlot(self, *args):
        """
        Creates a new IOS router.
        """
@@ -343,7 +344,10 @@ class IOSRouterPreferencesPage(QtWidgets.QWidget, Ui_IOSRouterPreferencesPageWid
        section_item = self._createSectionItem("General")
        QtWidgets.QTreeWidgetItem(section_item, ["Template name:", ios_router["name"]])
        QtWidgets.QTreeWidgetItem(section_item, ["Default name format:", ios_router["default_name_format"]])
-        QtWidgets.QTreeWidgetItem(section_item, ["Server:", ComputeManager.instance().getCompute(ios_router["server"]).name()])
+        try:
+            QtWidgets.QTreeWidgetItem(section_item, ["Server:", ComputeManager.instance().getCompute(ios_router["server"]).name()])
+        except KeyError:
+            pass
        QtWidgets.QTreeWidgetItem(section_item, ["Platform:", ios_router["platform"]])
        if ios_router["chassis"]:
            QtWidgets.QTreeWidgetItem(section_item, ["Chassis:", ios_router["chassis"]])
--- a/gns3/modules/dynamips/settings.py
+++ b/gns3/modules/dynamips/settings.py
@@ -24,7 +24,6 @@ from gns3.node import Node
 DYNAMIPS_SETTINGS = {
    "dynamips_path": "",
    "allocate_aux_console_ports": False,
-    "use_local_server": True,
    "ghost_ios_support": True,
    "sparse_memory_support": True,
    "mmap_support": True,
--- a/gns3/modules/dynamips/ui/dynamips_preferences_page.ui
+++ b/gns3/modules/dynamips/ui/dynamips_preferences_page.ui
@@ -21,22 +21,12 @@
     </property>
     <widget class="QWidget" name="uiGeneralSettingsTabWidget">
      <attribute name="title">
-       <string>General settings</string>
+       <string>Local settings</string>
      </attribute>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <property name="margin">
        <number>10</number>
       </property>
-       <item>
-        <widget class="QCheckBox" name="uiUseLocalServercheckBox">
-         <property name="text">
-          <string>Use the local server</string>
-         </property>
-         <property name="checked">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
       <item>
        <widget class="QLabel" name="uiDynamipsPathLabel">
         <property name="text">
@@ -92,7 +82,7 @@
     </widget>
     <widget class="QWidget" name="uiAdvancedSettingsTabWidget">
      <attribute name="title">
-       <string>Advanced settings</string>
+       <string>Advanced local settings</string>
      </attribute>
      <layout class="QVBoxLayout" name="verticalLayout_3">
       <property name="margin">
@@ -104,6 +94,9 @@
          <string>Memory usage optimisation</string>
         </property>
         <layout class="QVBoxLayout" name="verticalLayout">
+          <property name="margin">
+           <number>10</number>
+          </property>
          <item>
           <widget class="QCheckBox" name="uiGhostIOSSupportCheckBox">
            <property name="toolTip">
--- a/gns3/modules/dynamips/ui/dynamips_preferences_page_ui.py
+++ b/gns3/modules/dynamips/ui/dynamips_preferences_page_ui.py
@@ -2,7 +2,7 @@

 # Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/modules/dynamips/ui/dynamips_preferences_page.ui'
 #
-# Created: Mon Sep 19 11:16:52 2016
+# Created: Wed Dec  7 22:03:06 2016
 #      by: PyQt5 UI code generator 5.2.1
 #
 # WARNING! All changes made in this file will be lost!
@@ -22,10 +22,6 @@ class Ui_DynamipsPreferencesPageWidget(object):
        self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.uiGeneralSettingsTabWidget)
        self.verticalLayout_2.setContentsMargins(10, 10, 10, 10)
        self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.uiUseLocalServercheckBox = QtWidgets.QCheckBox(self.uiGeneralSettingsTabWidget)
-        self.uiUseLocalServercheckBox.setChecked(True)
-        self.uiUseLocalServercheckBox.setObjectName("uiUseLocalServercheckBox")
-        self.verticalLayout_2.addWidget(self.uiUseLocalServercheckBox)
        self.uiDynamipsPathLabel = QtWidgets.QLabel(self.uiGeneralSettingsTabWidget)
        self.uiDynamipsPathLabel.setObjectName("uiDynamipsPathLabel")
        self.verticalLayout_2.addWidget(self.uiDynamipsPathLabel)
@@ -58,6 +54,7 @@ class Ui_DynamipsPreferencesPageWidget(object):
        self.uiMemoryUsageOptimisationGroupBox = QtWidgets.QGroupBox(self.uiAdvancedSettingsTabWidget)
        self.uiMemoryUsageOptimisationGroupBox.setObjectName("uiMemoryUsageOptimisationGroupBox")
        self.verticalLayout = QtWidgets.QVBoxLayout(self.uiMemoryUsageOptimisationGroupBox)
+        self.verticalLayout.setContentsMargins(10, 10, 10, 10)
        self.verticalLayout.setObjectName("verticalLayout")
        self.uiGhostIOSSupportCheckBox = QtWidgets.QCheckBox(self.uiMemoryUsageOptimisationGroupBox)
        self.uiGhostIOSSupportCheckBox.setChecked(True)
@@ -96,11 +93,10 @@ class Ui_DynamipsPreferencesPageWidget(object):
    def retranslateUi(self, DynamipsPreferencesPageWidget):
        _translate = QtCore.QCoreApplication.translate
        DynamipsPreferencesPageWidget.setWindowTitle(_translate("DynamipsPreferencesPageWidget", "Dynamips"))
-        self.uiUseLocalServercheckBox.setText(_translate("DynamipsPreferencesPageWidget", "Use the local server"))
        self.uiDynamipsPathLabel.setText(_translate("DynamipsPreferencesPageWidget", "Path to Dynamips:"))
        self.uiDynamipsPathToolButton.setText(_translate("DynamipsPreferencesPageWidget", "&Browse..."))
        self.uiAllocateAuxConsolePortsCheckBox.setText(_translate("DynamipsPreferencesPageWidget", "Allocate AUX console ports"))
-        self.uiTabWidget.setTabText(self.uiTabWidget.indexOf(self.uiGeneralSettingsTabWidget), _translate("DynamipsPreferencesPageWidget", "General settings"))
+        self.uiTabWidget.setTabText(self.uiTabWidget.indexOf(self.uiGeneralSettingsTabWidget), _translate("DynamipsPreferencesPageWidget", "Local settings"))
        self.uiMemoryUsageOptimisationGroupBox.setTitle(_translate("DynamipsPreferencesPageWidget", "Memory usage optimisation"))
        self.uiGhostIOSSupportCheckBox.setToolTip(_translate("DynamipsPreferencesPageWidget", "The ghost IOS feature is a solution that helps to decrease memory usage by sharing an IOS image between different router instances."))
        self.uiGhostIOSSupportCheckBox.setText(_translate("DynamipsPreferencesPageWidget", "Enable ghost IOS support"))
@@ -108,6 +104,6 @@ class Ui_DynamipsPreferencesPageWidget(object):
        self.uiMmapSupportCheckBox.setText(_translate("DynamipsPreferencesPageWidget", "Enable mmap support"))
        self.uiSparseMemorySupportCheckBox.setToolTip(_translate("DynamipsPreferencesPageWidget", "The sparse memory feature reduces the amount of virtual memory used by router instances."))
        self.uiSparseMemorySupportCheckBox.setText(_translate("DynamipsPreferencesPageWidget", "Enable sparse memory support"))
-        self.uiTabWidget.setTabText(self.uiTabWidget.indexOf(self.uiAdvancedSettingsTabWidget), _translate("DynamipsPreferencesPageWidget", "Advanced settings"))
+        self.uiTabWidget.setTabText(self.uiTabWidget.indexOf(self.uiAdvancedSettingsTabWidget), _translate("DynamipsPreferencesPageWidget", "Advanced local settings"))
        self.uiRestoreDefaultsPushButton.setText(_translate("DynamipsPreferencesPageWidget", "Restore defaults"))

--- a/gns3/modules/dynamips/ui/ios_router_configuration_page.ui
+++ b/gns3/modules/dynamips/ui/ios_router_configuration_page.ui
@@ -24,6 +24,9 @@
       <string>General</string>
      </attribute>
      <layout class="QGridLayout" name="gridLayout_2">
+       <property name="margin">
+        <number>10</number>
+       </property>
       <item row="15" column="1">
        <spacer>
         <property name="orientation">
@@ -238,6 +241,9 @@
       <string>Memories and disks</string>
      </attribute>
      <layout class="QGridLayout" name="gridLayout_5">
+       <property name="margin">
+        <number>10</number>
+       </property>
       <item row="0" column="0">
        <widget class="QLabel" name="uiRamLabel">
         <property name="text">
@@ -413,6 +419,9 @@
       <string>Slots</string>
      </attribute>
      <layout class="QVBoxLayout" name="verticalLayout">
+       <property name="margin">
+        <number>10</number>
+       </property>
       <item>
        <widget class="QGroupBox" name="uiAdaptersGroupBox">
         <property name="title">
@@ -611,6 +620,9 @@
       <string>Advanced</string>
      </attribute>
      <layout class="QVBoxLayout" name="verticalLayout_4">
+       <property name="margin">
+        <number>10</number>
+       </property>
       <item>
        <widget class="QGroupBox" name="uiSystemGroupBox">
         <property name="title">
@@ -787,6 +799,9 @@
       <string>Environment</string>
      </attribute>
      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <property name="margin">
+        <number>10</number>
+       </property>
       <item>
        <widget class="QGroupBox" name="uiPowerSuppliesGroupBox">
         <property name="title">
--- a/gns3/modules/dynamips/ui/ios_router_configuration_page_ui.py
+++ b/gns3/modules/dynamips/ui/ios_router_configuration_page_ui.py
@@ -2,7 +2,7 @@

 # Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/modules/dynamips/ui/ios_router_configuration_page.ui'
 #
-# Created: Tue May 31 21:42:36 2016
+# Created: Thu Jan  5 14:49:45 2017
 #      by: PyQt5 UI code generator 5.2.1
 #
 # WARNING! All changes made in this file will be lost!
@@ -20,6 +20,7 @@ class Ui_iosRouterConfigPageWidget(object):
        self.uiGeneralPageWidget = QtWidgets.QWidget()
        self.uiGeneralPageWidget.setObjectName("uiGeneralPageWidget")
        self.gridLayout_2 = QtWidgets.QGridLayout(self.uiGeneralPageWidget)
+        self.gridLayout_2.setContentsMargins(10, 10, 10, 10)
        self.gridLayout_2.setObjectName("gridLayout_2")
        spacerItem = QtWidgets.QSpacerItem(263, 151, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
        self.gridLayout_2.addItem(spacerItem, 15, 1, 1, 1)
@@ -135,6 +136,7 @@ class Ui_iosRouterConfigPageWidget(object):
        self.uiMemoriesPageWidget = QtWidgets.QWidget()
        self.uiMemoriesPageWidget.setObjectName("uiMemoriesPageWidget")
        self.gridLayout_5 = QtWidgets.QGridLayout(self.uiMemoriesPageWidget)
+        self.gridLayout_5.setContentsMargins(10, 10, 10, 10)
        self.gridLayout_5.setObjectName("gridLayout_5")
        self.uiRamLabel = QtWidgets.QLabel(self.uiMemoriesPageWidget)
        self.uiRamLabel.setObjectName("uiRamLabel")
@@ -216,6 +218,7 @@ class Ui_iosRouterConfigPageWidget(object):
        self.uiSlotsPageWidget = QtWidgets.QWidget()
        self.uiSlotsPageWidget.setObjectName("uiSlotsPageWidget")
        self.verticalLayout = QtWidgets.QVBoxLayout(self.uiSlotsPageWidget)
+        self.verticalLayout.setContentsMargins(10, 10, 10, 10)
        self.verticalLayout.setObjectName("verticalLayout")
        self.uiAdaptersGroupBox = QtWidgets.QGroupBox(self.uiSlotsPageWidget)
        self.uiAdaptersGroupBox.setObjectName("uiAdaptersGroupBox")
@@ -343,6 +346,7 @@ class Ui_iosRouterConfigPageWidget(object):
        self.uiAdvancedPageWidget = QtWidgets.QWidget()
        self.uiAdvancedPageWidget.setObjectName("uiAdvancedPageWidget")
        self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.uiAdvancedPageWidget)
+        self.verticalLayout_4.setContentsMargins(10, 10, 10, 10)
        self.verticalLayout_4.setObjectName("verticalLayout_4")
        self.uiSystemGroupBox = QtWidgets.QGroupBox(self.uiAdvancedPageWidget)
        self.uiSystemGroupBox.setObjectName("uiSystemGroupBox")
@@ -426,6 +430,7 @@ class Ui_iosRouterConfigPageWidget(object):
        self.uiEnvironmentPageWidget = QtWidgets.QWidget()
        self.uiEnvironmentPageWidget.setObjectName("uiEnvironmentPageWidget")
        self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.uiEnvironmentPageWidget)
+        self.verticalLayout_3.setContentsMargins(10, 10, 10, 10)
        self.verticalLayout_3.setObjectName("verticalLayout_3")
        self.uiPowerSuppliesGroupBox = QtWidgets.QGroupBox(self.uiEnvironmentPageWidget)
        self.uiPowerSuppliesGroupBox.setObjectName("uiPowerSuppliesGroupBox")
--- a/gns3/modules/iou/init.py
+++ b/gns3/modules/iou/init.py
@@ -63,14 +63,6 @@ class IOU(Module):
        """

        self._settings = LocalConfig.instance().loadSectionSettings(self.__class__.__name__, IOU_SETTINGS)
-
-        if sys.platform.startswith("linux") and not os.path.exists(self._settings["iouyap_path"]):
-            iouyap_path = shutil.which("iouyap")
-            if iouyap_path:
-                self._settings["iouyap_path"] = os.path.abspath(iouyap_path)
-            else:
-                self._settings["iouyap_path"] = ""
-
        self._loadIOUDevices()

    def _saveSettings(self):
@@ -81,15 +73,6 @@ class IOU(Module):
        # save the settings
        LocalConfig.instance().saveSectionSettings(self.__class__.__name__, self._settings)

-        # save some settings to the local server config file
-        server_settings = {
-            "iourc_path": self._settings["iourc_path"],
-            "iouyap_path": self._settings["iouyap_path"],
-            "license_check": self._settings["license_check"]
-        }
-        config = LocalServerConfig.instance()
-        config.saveSettings(self.__class__.__name__, server_settings)
-
    def _loadIOUDevices(self):
        """
        Load the IOU devices from the persistent settings file.
@@ -216,7 +199,7 @@ class IOU(Module):
        if not iouimage:
            selected_images = []
            for image, info in self._iou_devices.items():
-                if info["server"] == node.server().host() or (node.server().isLocal() and info["server"] == "local"):
+                if info["server"] == node.compute().id():
                    selected_images.append(image)

            if not selected_images:
--- a/gns3/modules/iou/dialogs/iou_device_wizard.py
+++ b/gns3/modules/iou/dialogs/iou_device_wizard.py
@@ -44,7 +44,7 @@ class IOUDeviceWizard(VMWithImagesWizard, Ui_IOUDeviceWizard):

    def __init__(self, iou_devices, parent):

-        super().__init__(iou_devices, IOU.instance().settings()["use_local_server"], parent)
+        super().__init__(iou_devices, parent)
        self.setPixmap(QtWidgets.QWizard.LogoPixmap, QtGui.QPixmap(":/symbols/multilayer_switch.svg"))

        self.uiTypeComboBox.currentIndexChanged[str].connect(self._typeChangedSlot)
--- a/gns3/modules/iou/iou_device.py
+++ b/gns3/modules/iou/iou_device.py
@@ -58,8 +58,7 @@ class IOUDevice(Node):
                               "ethernet_adapters": IOU_DEVICE_SETTINGS["ethernet_adapters"],
                               "serial_adapters": IOU_DEVICE_SETTINGS["serial_adapters"],
                               "console": None,
-                               "console_host": None,
-                               "iourc_content": None}
+                               "console_host": None}

        self.settings().update(iou_device_settings)

@@ -87,7 +86,6 @@ class IOUDevice(Node):
                params["private_config_content"] = base_config_content
            del additional_settings["private_config"]

-        params = self._addIourcContentToParams(params)
        params.update(additional_settings)
        self._create(name, node_id, params, default_name_format)

@@ -109,27 +107,10 @@ class IOUDevice(Node):
            return

        params = {}
-        params = self._addIourcContentToParams(params)

        log.debug("{} is starting".format(self.name()))
        self.controllerHttpPost("/nodes/{node_id}/start".format(node_id=self._node_id), self._startCallback, progressText="{} is starting".format(self.name()))

-    def _addIourcContentToParams(self, params):
-        """
-        If an IOURC file exist push it when starting the IOU device
-        """
-        # push the iourc file
-        module_settings = self._module.settings()
-        if module_settings["iourc_path"] and os.path.isfile(module_settings["iourc_path"]):
-            try:
-                with open(module_settings["iourc_path"], "rb") as f:
-                    params["iourc_content"] = f.read().decode("utf-8")
-            except OSError as e:
-                log.error("Can't open iourc file {}: {}".format(module_settings["iourc_path"], e))
-            except UnicodeDecodeError as e:
-                log.error("Invalid IOURC file {}: {}".format(module_settings["iourc_path"], e))
-        return params
-
    def update(self, new_settings):
        """
        Updates the settings for this IOU device.
@@ -186,7 +167,7 @@ class IOUDevice(Node):
           node_id=self._node_id,
           state=state,
           memories_info=memories_info,
-           host=self.compute().id(),
+           host=self.compute().name(),
           console=self._settings["console"],
           image_name=os.path.basename(self._settings["path"]),
           nb_ethernet=self._settings["ethernet_adapters"],
@@ -244,7 +225,7 @@ class IOUDevice(Node):
            except OSError as e:
                self.error_signal.emit(self.id(), "could not export startup-config to {}: {}".format(startup_config_path, e))

-        if "private_config_content" in result:
+        if "private_config_content" in result and result["private_config_content"] is not None and len(result["private_config_content"]) > 0:
            private_config_path = os.path.join(export_directory, normalize_filename(self.name())) + "_private-config.cfg"
            try:
                with open(private_config_path, "wb") as f:
@@ -287,8 +268,6 @@ class IOUDevice(Node):
        new_settings = {}
        if startup_config in contents:
            new_settings["startup_config"] = os.path.join(directory, startup_config)
-        else:
-            self.warning_signal.emit(self.id(), "no startup-config file could be found, expected file name: {}".format(startup_config))

        if private_config in contents:
            new_settings["private_config"] = os.path.join(directory, private_config)
--- 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
--- a/gns3/modules/iou/pages/iou_device_preferences_page.py
+++ b/gns3/modules/iou/pages/iou_device_preferences_page.py
@@ -22,7 +22,7 @@ Configuration page for IOU device preferences.
 import copy
 import os

-from gns3.qt import QtCore, QtGui, QtWidgets, qpartial
+from gns3.qt import QtCore, QtWidgets, qpartial

 from gns3.main_window import MainWindow
 from gns3.dialogs.configuration_dialog import ConfigurationDialog
@@ -75,8 +75,12 @@ class IOUDevicePreferencesPage(QtWidgets.QWidget, Ui_IOUDevicePreferencesPageWid
        section_item = self._createSectionItem("General")
        QtWidgets.QTreeWidgetItem(section_item, ["Template name:", iou_device["name"]])
        QtWidgets.QTreeWidgetItem(section_item, ["Default name format:", iou_device["default_name_format"]])
-        QtWidgets.QTreeWidgetItem(section_item, ["Server:", ComputeManager.instance().getCompute(iou_device["server"]).name()])
-        QtWidgets.QTreeWidgetItem(section_item, ["Image:", iou_device["image"]])
+        try:
+            QtWidgets.QTreeWidgetItem(section_item, ["Server:", ComputeManager.instance().getCompute(iou_device["server"]).name()])
+        except KeyError:
+            # Compute doesn't exists
+            pass
+        QtWidgets.QTreeWidgetItem(section_item, ["Image:", iou_device["path"]])
        if iou_device["startup_config"]:
            QtWidgets.QTreeWidgetItem(section_item, ["Startup-config:", iou_device["startup_config"]])

@@ -165,7 +169,7 @@ class IOUDevicePreferencesPage(QtWidgets.QWidget, Ui_IOUDevicePreferencesPageWid
                    del self._iou_devices[key]
                    item.setText(0, iou_device["name"])
                    item.setData(0, QtCore.Qt.UserRole, new_key)
-                self._refreshInfo(iou_device)
+                self._refreshInfo(dialog.settings)

    def _iouDeviceDeleteSlot(self):
        """
@@ -233,7 +237,7 @@ class IOUDevicePreferencesPage(QtWidgets.QWidget, Ui_IOUDevicePreferencesPageWid
        path, _ = QtWidgets.QFileDialog.getOpenFileName(parent,
                                                        "Select an IOU image",
                                                        cls._default_images_dir,
-                                                        "All files (*)",
+                                                        "All file (*);;IOU image (*.bin *.image)",
                                                        "IOU image (*.bin *.image)")

        if not path:
@@ -274,4 +278,3 @@ class IOUDevicePreferencesPage(QtWidgets.QWidget, Ui_IOUDevicePreferencesPageWid
    def _setItemIcon(self, item, icon):
        item.setIcon(0, icon)
        self.uiIOUDevicesTreeWidget.setMaximumWidth(self.uiIOUDevicesTreeWidget.sizeHintForColumn(0) + 10)
-
--- a/Show More
+++ b/Show More