diff --git a/src/Gui/CADNavigationStyle.cpp b/src/Gui/CADNavigationStyle.cpp
index b6e49d632..b7aae8f48 100644
--- a/src/Gui/CADNavigationStyle.cpp
+++ b/src/Gui/CADNavigationStyle.cpp
@@ -71,7 +71,7 @@ const char* CADNavigationStyle::mouseButtons(ViewerMode mode)
     case NavigationStyle::DRAGGING:
         return QT_TR_NOOP("Press left and middle mouse button");
     case NavigationStyle::ZOOMING:
-        return QT_TR_NOOP("Scroll middle mouse button");
+        return QT_TR_NOOP("Scroll middle mouse button or middle and left click");
     default:
         return "No description";
     }
diff --git a/src/Gui/DlgSettings3DView.ui b/src/Gui/DlgSettings3DView.ui
index cd289df1e..6c1fbaa26 100644
--- a/src/Gui/DlgSettings3DView.ui
+++ b/src/Gui/DlgSettings3DView.ui
@@ -176,7 +176,7 @@
            <double>0.050000000000000</double>
           </property>
           <property name="value">
-           <double>0.050000000000000</double>
+           <double>0.200000000000000</double>
           </property>
           <property name="prefEntry" stdset="0">
            <cstring>ZoomStep</cstring>
@@ -190,7 +190,10 @@
       </item>
       <item row="5" column="0">
        <widget class="Gui::PrefCheckBox" name="checkBoxInvertZoom">
-        <property name="text">
+	   <property name="checked">
+		   <bool>true</bool>
+	   </property>
+       <property name="text">
          <string>Invert zoom</string>
         </property>
         <property name="prefEntry" stdset="0">
diff --git a/src/Gui/DlgSettingsViewColor.ui b/src/Gui/DlgSettingsViewColor.ui
index bcd5cd44f..6acaaeaf9 100644
--- a/src/Gui/DlgSettingsViewColor.ui
+++ b/src/Gui/DlgSettingsViewColor.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>601</width>
-    <height>445</height>
+    <height>565</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -652,17 +652,20 @@
   <tabstop>checkBoxSelection</tabstop>
   <tabstop>HighlightColor</tabstop>
   <tabstop>SelectionColor</tabstop>
+  <tabstop>DefaultShapeColor</tabstop>
+  <tabstop>DefaultShapeLineWidth</tabstop>
+  <tabstop>DefaultShapeLineColor</tabstop>
   <tabstop>CursorTextColor</tabstop>
   <tabstop>EditedEdgeColor</tabstop>
   <tabstop>EditedVertexColor</tabstop>
   <tabstop>ConstructionColor</tabstop>
   <tabstop>FullyConstrainedColor</tabstop>
   <tabstop>radioButtonSimple</tabstop>
-  <tabstop>radioButtonGradient</tabstop>
-  <tabstop>checkMidColor</tabstop>
   <tabstop>SelectionColor_Background</tabstop>
+  <tabstop>radioButtonGradient</tabstop>
   <tabstop>backgroundColorFrom</tabstop>
   <tabstop>backgroundColorTo</tabstop>
+  <tabstop>checkMidColor</tabstop>
   <tabstop>backgroundColorMid</tabstop>
  </tabstops>
  <resources/>
diff --git a/src/Gui/NavigationStyle.cpp b/src/Gui/NavigationStyle.cpp
index e801e1490..836b6f7bf 100644
--- a/src/Gui/NavigationStyle.cpp
+++ b/src/Gui/NavigationStyle.cpp
@@ -226,11 +226,11 @@ void NavigationStyle::initialize()
     this->shiftdown = FALSE;
     this->altdown = FALSE;
     this->invertZoom = App::GetApplication().GetParameterGroupByPath
-        ("User parameter:BaseApp/Preferences/View")->GetBool("InvertZoom",false);
+        ("User parameter:BaseApp/Preferences/View")->GetBool("InvertZoom",true);
     this->zoomAtCursor = App::GetApplication().GetParameterGroupByPath
         ("User parameter:BaseApp/Preferences/View")->GetBool("ZoomAtCursor",false);
     this->zoomStep = App::GetApplication().GetParameterGroupByPath
-        ("User parameter:BaseApp/Preferences/View")->GetFloat("ZoomStep",0.05f);
+        ("User parameter:BaseApp/Preferences/View")->GetFloat("ZoomStep",0.2f);
 }
 
 void NavigationStyle::finalize()
diff --git a/src/Gui/TaskView/TaskWatcher.cpp b/src/Gui/TaskView/TaskWatcher.cpp
index d32809ed2..e3143ddfe 100644
--- a/src/Gui/TaskView/TaskWatcher.cpp
+++ b/src/Gui/TaskView/TaskWatcher.cpp
@@ -143,5 +143,30 @@ bool TaskWatcherCommandsEmptyDoc::shouldShow()
     return doc && doc->countObjects() == 0;
 }
 
+//**************************************************************************
+//**************************************************************************
+// TaskWatcherCommandsEmptySelection
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+TaskWatcherCommandsEmptySelection::TaskWatcherCommandsEmptySelection(const char* commands[],
+                                                         const char* name,
+                                                         const char* pixmap )
+    : TaskWatcherCommands(0,commands,name,pixmap)
+{
+}
+
+TaskWatcherCommandsEmptySelection::~TaskWatcherCommandsEmptySelection()
+{
+}
+
+//==== implementer ===========================================================================
+
+
+//==== calls from the TaskView ===============================================================
+
+bool TaskWatcherCommandsEmptySelection::shouldShow()
+{
+    return (App::GetApplication().getActiveDocument() && Gui::Selection().size() == 0);
+}
 
 #include "moc_TaskWatcher.cpp"
diff --git a/src/Gui/TaskView/TaskWatcher.h b/src/Gui/TaskView/TaskWatcher.h
index c5e1cdd16..df7bdbf7f 100644
--- a/src/Gui/TaskView/TaskWatcher.h
+++ b/src/Gui/TaskView/TaskWatcher.h
@@ -97,6 +97,23 @@ public:
 
 };
 
+// --------------------------------------------------------------------------
+
+/// Special watcher class for showing commands when there is nothing selected
+class GuiExport TaskWatcherCommandsEmptySelection : public TaskWatcherCommands
+{
+    Q_OBJECT
+
+public:
+    TaskWatcherCommandsEmptySelection(const char* commands[], const char* name, const char* pixmap);
+    ~TaskWatcherCommandsEmptySelection();
+
+public:
+    /// is called wenn the document or the Selection changes. 
+    virtual bool shouldShow(void);
+
+};
+
 
 
 } //namespace TaskView
diff --git a/src/Mod/Part/Gui/ViewProviderExt.cpp b/src/Mod/Part/Gui/ViewProviderExt.cpp
index 10260b9be..7dc155b08 100644
--- a/src/Mod/Part/Gui/ViewProviderExt.cpp
+++ b/src/Mod/Part/Gui/ViewProviderExt.cpp
@@ -860,9 +860,10 @@ void ViewProviderPartExt::updateVisual(const TopoDS_Shape& inputShape)
         Base::Console().Error("Cannot compute Inventor representation for the shape of %s.\n",pcObject->getNameInDocument());
     }
 
-    // printing some informations
-    Base::Console().Log("ViewProvider update time: %f s\n",Base::TimeInfo::diffTimeF(start_time,Base::TimeInfo()));
-    Base::Console().Log("Shape tria info: Faces:%d Edges:%d Nodes:%d Triangles:%d IdxVec:%d\n",nbrFaces,nbrEdges,nbrNodes,nbrTriangles,nbrLines);
-
+#   ifdef FC_DEBUG
+        // printing some informations
+        Base::Console().Log("ViewProvider update time: %f s\n",Base::TimeInfo::diffTimeF(start_time,Base::TimeInfo()));
+        Base::Console().Log("Shape tria info: Faces:%d Edges:%d Nodes:%d Triangles:%d IdxVec:%d\n",nbrFaces,nbrEdges,nbrNodes,nbrTriangles,nbrLines);
+#   endif 
     VisualTouched = false;
 }
diff --git a/src/Mod/PartDesign/Gui/Workbench.cpp b/src/Mod/PartDesign/Gui/Workbench.cpp
index 5a11069c1..1cdb6c3ca 100644
--- a/src/Mod/PartDesign/Gui/Workbench.cpp
+++ b/src/Mod/PartDesign/Gui/Workbench.cpp
@@ -140,7 +140,7 @@ void Workbench::activated()
         "Part_Box",
         "Part_Cylinder",
         0};
-   Watcher.push_back(new Gui::TaskView::TaskWatcherCommandsEmptyDoc(
+   Watcher.push_back(new Gui::TaskView::TaskWatcherCommandsEmptySelection(
          Empty,
         "Create Geometry",
         "Part_Box"