diff --git a/limereport/lrdatadesignintf.cpp b/limereport/lrdatadesignintf.cpp
index 23bd44c..2cde1d9 100644
--- a/limereport/lrdatadesignintf.cpp
+++ b/limereport/lrdatadesignintf.cpp
@@ -507,7 +507,7 @@ QObject *ProxyDesc::elementAt(const QString &collectionName, int index)
 
 ProxyHolder::ProxyHolder(ProxyDesc* desc, DataSourceManager* dataManager)
     :m_model(0), m_desc(desc), m_lastError(""), m_mode(IDataSource::RENDER_MODE),
-     m_invalid(false), m_dataManger(dataManager)
+     m_invalid(false), m_dataManager(dataManager)
 {}
 
 QString ProxyHolder::masterDatasource()
diff --git a/limereport/lrdatadesignintf.h b/limereport/lrdatadesignintf.h
index 3486549..2336ad5 100644
--- a/limereport/lrdatadesignintf.h
+++ b/limereport/lrdatadesignintf.h
@@ -337,7 +337,7 @@ public:
     void invalidate(IDataSource::DatasourceMode mode, bool dbWillBeClosed = false);
     void update(){}
     void clearErrors(){m_lastError = "";}
-    DataSourceManager* dataManager() const {return m_dataManger;}
+    DataSourceManager* dataManager() const {return m_dataManager;}
 private slots:
     void slotChildModelDestoroyed();
 private:
@@ -347,7 +347,7 @@ private:
     QString m_lastError;
     IDataSource::DatasourceMode m_mode;
     bool m_invalid;
-    DataSourceManager* m_dataManger;
+    DataSourceManager* m_dataManager;
 };
 
 class ModelToDataSource : public QObject, public IDataSource{
diff --git a/limereport/lrscriptenginemanager.cpp b/limereport/lrscriptenginemanager.cpp
index 6dd5ea8..fa78023 100644
--- a/limereport/lrscriptenginemanager.cpp
+++ b/limereport/lrscriptenginemanager.cpp
@@ -262,7 +262,7 @@ bool ScriptEngineManager::addFunction(const JSFunctionDesc &functionDescriber)
             return false;
         }
     } else {
-        m_lastError = tr("Function manger with name \"%1\" already exists!");
+        m_lastError = tr("Function manager with name \"%1\" already exists!");
         return false;
     }
 
diff --git a/limereport/lrscriptenginemanager.h b/limereport/lrscriptenginemanager.h
index a15f524..2241c85 100644
--- a/limereport/lrscriptenginemanager.h
+++ b/limereport/lrscriptenginemanager.h
@@ -232,10 +232,10 @@ public:
                    const QString& functionCategory,
                    const QString& functionDescription,
                    const QString& functionManagerName,
-                   QObject* functionManger,
+                   QObject* functionManager,
                    const QString& functionScriptWrapper
                    ): m_name(functionName), m_category(functionCategory), m_description(functionDescription),
-                      m_managerName(functionManagerName), m_manager(functionManger), m_scriptWrapper(functionScriptWrapper)
+                      m_managerName(functionManagerName), m_manager(functionManager), m_scriptWrapper(functionScriptWrapper)
     {}
     QString name() const;
     void setName(const QString &name);
diff --git a/limereport/lrsettingdialog.ui b/limereport/lrsettingdialog.ui
index fa7da68..19d27fe 100644
--- a/limereport/lrsettingdialog.ui
+++ b/limereport/lrsettingdialog.ui
@@ -7,11 +7,11 @@
     <x>0</x>
     <y>0</y>
     <width>397</width>
-    <height>378</height>
+    <height>345</height>
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+   <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -20,6 +20,9 @@
    <string>Designer setting</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
+   <property name="sizeConstraint">
+    <enum>QLayout::SetDefaultConstraint</enum>
+   </property>
    <item>
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">