diff --git a/src/Waypoint.cc b/src/Waypoint.cc
index dc9d3a6c9374cc6f795baeb3524f4a7249571a89..33e0bf62a8b663a29fd81427e2b427883fd0d93d 100644
--- a/src/Waypoint.cc
+++ b/src/Waypoint.cc
@@ -191,6 +191,16 @@ void Waypoint::setAction(MAV_CMD action)
 {
     if (this->action != action) {
         this->action = action;
+
+        // Flick defaults according to WP type
+
+        switch (this->action) {
+            case MAV_CMD_NAV_TAKEOFF:
+            // We default to 15 degrees minimum takeoff pitch
+            this->param1 = 15.0;
+            break;
+        }
+
         emit changed(this);
     }
 }
diff --git a/src/ui/mission/QGCMissionNavTakeoff.ui b/src/ui/mission/QGCMissionNavTakeoff.ui
index 7536c844f439a0a340da0edf5250feb21cbbf1d6..bf0aab426e00b801baf4f9ec495a75c4d1a9a254 100644
--- a/src/ui/mission/QGCMissionNavTakeoff.ui
+++ b/src/ui/mission/QGCMissionNavTakeoff.ui
@@ -32,7 +32,16 @@
    <property name="spacing">
     <number>5</number>
    </property>
-   <property name="margin">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
@@ -296,7 +305,7 @@
       <bool>false</bool>
      </property>
      <property name="prefix">
-      <string/>
+      <string>heading </string>
      </property>
      <property name="suffix">
       <string>°</string>
@@ -329,6 +338,9 @@
      <property name="keyboardTracking">
       <bool>false</bool>
      </property>
+     <property name="prefix">
+      <string>min. pitch </string>
+     </property>
      <property name="suffix">
       <string>°</string>
      </property>