diff --git a/src/Mod/Arch/ArchSchedule.py b/src/Mod/Arch/ArchSchedule.py
index 3151ca51fb..5eecf12acc 100644
--- a/src/Mod/Arch/ArchSchedule.py
+++ b/src/Mod/Arch/ArchSchedule.py
@@ -536,20 +536,27 @@ class ArchScheduleTaskPanel:
         if not self.obj.Proxy.data:
             return
 
-        filename = QtGui.QFileDialog.getSaveFileName(QtGui.QApplication.activeWindow(), translate("Arch","Export CSV File"), None, "CSV (*.csv);;Markdown (*.md)");
+        filename = QtGui.QFileDialog.getSaveFileName(QtGui.QApplication.activeWindow(),
+                                                     translate("Arch","Export CSV File"),
+                                                     None,
+                                                     "Comma-separated values (*.csv);;TAB-separated values (*.tsv);;Markdown (*.md)");
         if filename:
             filt = filename[1]
             filename = filename[0]
             if sys.version_info.major < 3:
                 filename = filename.encode("utf8")
             # add missing extension
-            if (not filename.lower().endswith(".csv")) and (not filename.lower().endswith(".md")):
+            if (not filename.lower().endswith(".csv")) and (not filename.lower().endswith(".tsv")) and (not filename.lower().endswith(".md")):
                 if "csv" in filt:
                     filename += ".csv"
+                elif "tsv" in filt:
+                    filename += ".tsv"
                 else:
                     filename += ".md"
             if filename.lower().endswith(".csv"):
-                self.exportCSV(filename)
+                self.exportCSV(filename,delimiter=",")
+            elif filename.lower().endswith(".tsv"):
+                self.exportCSV(filename,delimiter="\t")
             elif filename.lower().endswith(".md"):
                 self.exportMD(filename)
             else:
@@ -568,16 +575,13 @@ class ArchScheduleTaskPanel:
         rows.sort(key=int)
         return rows
 
-    def exportCSV(self,filename):
+    def exportCSV(self,filename,delimiter="\t"):
 
-        """Exports the results as a CSV file"""
-
-        # use TAB to separate values
-        DELIMITER = "\t"
+        """Exports the results as a CSV/TSV file"""
 
         import csv
         with open(filename, 'w') as csvfile:
-            csvfile = csv.writer(csvfile,delimiter=DELIMITER)
+            csvfile = csv.writer(csvfile,delimiter=delimiter)
             csvfile.writerow([translate("Arch","Description"),translate("Arch","Value"),translate("Arch","Unit")])
             if self.obj.DetailedResults:
                 csvfile.writerow(["","",""])
diff --git a/src/Mod/Arch/Resources/ui/ArchSchedule.ui b/src/Mod/Arch/Resources/ui/ArchSchedule.ui
index 3bb2cbbdff..e07353b61a 100644
--- a/src/Mod/Arch/Resources/ui/ArchSchedule.ui
+++ b/src/Mod/Arch/Resources/ui/ArchSchedule.ui
@@ -24,7 +24,11 @@
       </widget>
      </item>
      <item>
-      <widget class="Gui::PrefLineEdit" name="lineEditName"/>
+      <widget class="Gui::PrefLineEdit" name="lineEditName">
+       <property name="text">
+        <string>Unnamed schedule</string>
+       </property>
+      </widget>
      </item>
     </layout>
    </item>
@@ -124,23 +128,8 @@ Leave blank to use all objects from the document</string>
     </layout>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QPushButton" name="buttonAdd">
-       <property name="toolTip">
-        <string>Adds a line below the selected line/cell</string>
-       </property>
-       <property name="text">
-        <string>Add row</string>
-       </property>
-       <property name="icon">
-        <iconset theme="add">
-         <normaloff/>
-        </iconset>
-       </property>
-      </widget>
-     </item>
-     <item>
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="0" column="1">
       <widget class="QPushButton" name="buttonDel">
        <property name="toolTip">
         <string>Deletes the selected line</string>
@@ -155,7 +144,22 @@ Leave blank to use all objects from the document</string>
        </property>
       </widget>
      </item>
-     <item>
+     <item row="0" column="0">
+      <widget class="QPushButton" name="buttonAdd">
+       <property name="toolTip">
+        <string>Adds a line below the selected line/cell</string>
+       </property>
+       <property name="text">
+        <string>Add row</string>
+       </property>
+       <property name="icon">
+        <iconset theme="add">
+         <normaloff/>
+        </iconset>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2">
       <widget class="QPushButton" name="buttonClear">
        <property name="toolTip">
         <string>Clears the whole list</string>
@@ -170,11 +174,7 @@ Leave blank to use all objects from the document</string>
        </property>
       </widget>
      </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
+     <item row="1" column="0">
       <widget class="QPushButton" name="buttonSelect">
        <property name="toolTip">
         <string>Put selected objects into the &quot;Objects&quot; column of the selected row</string>
@@ -184,7 +184,7 @@ Leave blank to use all objects from the document</string>
        </property>
       </widget>
      </item>
-     <item>
+     <item row="1" column="1">
       <widget class="QPushButton" name="buttonImport">
        <property name="toolTip">
         <string>Imports the contents of a CSV file</string>
@@ -199,7 +199,7 @@ Leave blank to use all objects from the document</string>
        </property>
       </widget>
      </item>
-     <item>
+     <item row="1" column="2">
       <widget class="QPushButton" name="buttonExport">
        <property name="toolTip">
         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This exports the results to a CSV or Markdown file. &lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Note for CSV export:&lt;/span&gt;&lt;/p&gt;&lt;p&gt;In Libreoffice, you can keep this CSV file linked by right-clicking the Sheets tab bar -&amp;gt; New sheet -&amp;gt; From file -&amp;gt; Link (Note: as of LibreOffice v5.4.5.1 the correct path now is: Sheets tab bar -&amp;gt; Insert Sheet... -&amp;gt; From file -&amp;gt; Browse...)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>