diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index 6e4527feec..f8bf5da148 100644
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -129,6 +129,10 @@ class CuraApplication(QtApplication):
                 continue
 
             self._recent_files.append(QUrl.fromLocalFile(f))
+
+    @pyqtSlot(result = QUrl)
+    def getDefaultSavePath(self):
+        return QUrl.fromLocalFile(os.path.expanduser("~/"))
     
     ##  Handle loading of all plugin types (and the backend explicitly)
     #   \sa PluginRegistery
diff --git a/plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py b/plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py
index 455091c4bb..25530c52c2 100644
--- a/plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py
+++ b/plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py
@@ -151,6 +151,7 @@ class ProcessSlicedObjectListJob(Job):
             if Application.getInstance().getController().getActiveView().getPluginId() == "LayerView":
                 if not self._progress:
                     self._progress = Message(catalog.i18nc("@info:status", "Processing Layers"), 0, False, 0)
+                if self._progress.getProgress() != 100:
                     self._progress.show()
             else:
                 if self._progress:
diff --git a/plugins/LayerView/LayerView.py b/plugins/LayerView/LayerView.py
index daf96d9b2e..e86590e1d0 100644
--- a/plugins/LayerView/LayerView.py
+++ b/plugins/LayerView/LayerView.py
@@ -158,8 +158,7 @@ class LayerView(View):
             else:
                 self.setLayer(int(self._max_layers))
                 self.maxLayersChanged.emit()
-
-        self._top_layer_timer.start()
+            self._top_layer_timer.start()
 
     maxLayersChanged = Signal()
     currentLayerNumChanged = Signal()
diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
index 77bc97256f..85d631b82f 100644
--- a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
+++ b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
@@ -89,7 +89,6 @@ Item {
         Button
         {
             id: customise_settings_button;
-            anchors.right: profileSelection.right;
             height: UM.Theme.getSize("setting").height;
             visible: parseInt(UM.Preferences.getValue("cura/active_mode")) == 1
 
diff --git a/plugins/USBPrinting/USBPrinterManager.py b/plugins/USBPrinting/USBPrinterManager.py
index 57499b9a47..3a2beab0c8 100644
--- a/plugins/USBPrinting/USBPrinterManager.py
+++ b/plugins/USBPrinting/USBPrinterManager.py
@@ -106,6 +106,7 @@ class USBPrinterManager(QObject, SignalEmitter, OutputDevicePlugin, Extension):
             try:
                 self._printer_connections[printer_connection].updateFirmware(Resources.getPath(CuraApplication.ResourceTypes.Firmware, self._getDefaultFirmwareName()))
             except FileNotFoundError:
+                self._printer_connections[printer_connection].setProgress(100, 100)
                 Logger.log("w", "No firmware found for printer %s", printer_connection)
                 continue
 
diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json
index 4e8a8fbcc7..9d63939781 100644
--- a/resources/machines/fdmprinter.json
+++ b/resources/machines/fdmprinter.json
@@ -588,7 +588,6 @@
                     "default": 10,
                     "min_value": "0",
                     "max_value_warning": "100",
-                    "inherit_function": "10 if infill_sparse_density < 95 else 0",
                     "visible": false
                 },
                 "infill_wipe_dist": {
diff --git a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile
index 6ef1b1b74b..069f964e4d 100644
--- a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile
@@ -15,7 +15,6 @@ travel_compensate_overlapping_walls_enabled = True
 skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 22
-infill_overlap = 0.022
 infill_wipe_dist = 0.1
 retraction_amount = 6
 retraction_min_travel = 0.5
diff --git a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
index 928355e936..870f8da6ed 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
@@ -15,7 +15,6 @@ travel_compensate_overlapping_walls_enabled = True
 skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 18
-infill_overlap = 0.035
 infill_wipe_dist = 0.2
 retraction_amount = 5.5
 retraction_min_travel = 0.5
diff --git a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
index 4fe6278913..a2a89d897f 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
@@ -15,7 +15,6 @@ travel_compensate_overlapping_walls_enabled = True
 skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 22
-infill_overlap = 0.035
 infill_wipe_dist = 0.2
 retraction_amount = 5.5
 retraction_min_travel = 0.5
diff --git a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
index 8dd527ba73..54dedd578d 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
@@ -15,7 +15,6 @@ travel_compensate_overlapping_walls_enabled = True
 skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 20
-infill_overlap = 0.035
 infill_wipe_dist = 0.2
 retraction_amount = 5.5
 retraction_min_travel = 0.5
diff --git a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile
index 611c416bdc..eccc14ecff 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile
@@ -15,7 +15,6 @@ travel_compensate_overlapping_walls_enabled = True
 skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 25
-infill_overlap = 0.035
 infill_wipe_dist = 0.2
 retraction_amount = 5.5
 retraction_min_travel = 0.5
diff --git a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
index 3257c79446..6a5f4033b1 100644
--- a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
@@ -15,7 +15,6 @@ travel_compensate_overlapping_walls_enabled = True
 skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 20
-infill_overlap = 0.053
 infill_wipe_dist = 0.3
 retraction_amount = 6
 retraction_min_travel = 0.5
diff --git a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile
index 936c46b742..fe454b5c32 100644
--- a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile
@@ -15,7 +15,6 @@ travel_compensate_overlapping_walls_enabled = True
 skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 20
-infill_overlap = 0.07
 infill_wipe_dist = 0.4
 retraction_amount = 6
 retraction_min_travel = 0.5
diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index cdd97b84cb..76a367607a 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -667,7 +667,7 @@ UM.MainWindow
         //TODO: Support multiple file selection, workaround bug in KDE file dialog
         //selectMultiple: true
         nameFilters: UM.MeshFileHandler.supportedReadFileTypes;
-
+        folder: Printer.getDefaultSavePath()
         onAccepted:
         {
             //Because several implementations of the file dialog only update the folder