Index: src/app/qgsoptions.cpp
===================================================================
--- src/app/qgsoptions.cpp	(Revision 15531)
+++ src/app/qgsoptions.cpp	(Arbeitskopie)
@@ -109,6 +109,17 @@
     }
   }
 
+  //image creation options
+  QMap<QString, QVariant> defaultImageCreationMap;
+  defaultImageCreationMap.insert( "COMPRESS", "PACKBITS" );
+  defaultImageCreationMap.insert( "BIGTIFF", "IF_NEEDED" );
+  QMap<QString, QVariant> imageCreationOptions = settings.value( "/qgis/imageCreationOptions", QVariant( defaultImageCreationMap ) ).toMap();
+  QMap<QString, QVariant>::const_iterator creationIt = imageCreationOptions.constBegin();
+  for ( ; creationIt != imageCreationOptions.constEnd(); ++creationIt )
+  {
+    mImageCreationOptionsLineEdit->append( creationIt.key() + "=" + creationIt.value().toString() );
+  }
+
   //Network timeout
   mNetworkTimeoutSpinBox->setValue( settings.value( "/qgis/networkAndProxy/networkTimeout", "60000" ).toInt() );
 
@@ -401,35 +412,6 @@
   groupBox_5->setEnabled( false );
 #endif //Q_WS_MAC
 
-  //overlay placement algorithm
-  mOverlayAlgorithmComboBox->insertItem( 0, tr( "Central point (fastest)" ) );
-  mOverlayAlgorithmComboBox->insertItem( 1, tr( "Chain (fast)" ) );
-  mOverlayAlgorithmComboBox->insertItem( 2, tr( "Popmusic tabu chain (slow)" ) );
-  mOverlayAlgorithmComboBox->insertItem( 3, tr( "Popmusic tabu (slow)" ) );
-  mOverlayAlgorithmComboBox->insertItem( 4, tr( "Popmusic chain (very slow)" ) );
-
-  QString overlayAlgorithmString = settings.value( "qgis/overlayPlacementAlgorithm", "Central point" ).toString();
-  if ( overlayAlgorithmString == "Chain" )
-  {
-    mOverlayAlgorithmComboBox->setCurrentIndex( 1 );
-  }
-  else if ( overlayAlgorithmString == "Popmusic tabu chain" )
-  {
-    mOverlayAlgorithmComboBox->setCurrentIndex( 2 );
-  }
-  else if ( overlayAlgorithmString == "Popmusic tabu" )
-  {
-    mOverlayAlgorithmComboBox->setCurrentIndex( 3 );
-  }
-  else if ( overlayAlgorithmString == "Popmusic chain" )
-  {
-    mOverlayAlgorithmComboBox->setCurrentIndex( 4 );
-  }
-  else
-  {
-    mOverlayAlgorithmComboBox->setCurrentIndex( 0 );
-  } //default is central point
-
   restoreGeometry( settings.value( "/Windows/Options/geometry" ).toByteArray() );
   tabWidget->setCurrentIndex( settings.value( "/Windows/Options/row" ).toInt() );
 }
@@ -586,29 +568,6 @@
   settings.setValue( "/qgis/warnOldProjectVersion", chbWarnOldProjectVersion->isChecked() );
   settings.setValue( "/qgis/nullValue", leNullValue->text() );
 
-  //overlay placement method
-  int overlayIndex = mOverlayAlgorithmComboBox->currentIndex();
-  if ( overlayIndex == 1 )
-  {
-    settings.setValue( "/qgis/overlayPlacementAlgorithm", "Chain" );
-  }
-  else if ( overlayIndex == 2 )
-  {
-    settings.setValue( "/qgis/overlayPlacementAlgorithm", "Popmusic tabu chain" );
-  }
-  else if ( overlayIndex == 3 )
-  {
-    settings.setValue( "/qgis/overlayPlacementAlgorithm",  "Popmusic tabu" );
-  }
-  else if ( overlayIndex == 4 )
-  {
-    settings.setValue( "/qgis/overlayPlacementAlgorithm", "Popmusic chain" );
-  }
-  else
-  {
-    settings.setValue( "/qgis/overlayPlacementAlgorithm", "Central point" );
-  }
-
   if ( cmbTheme->currentText().length() == 0 )
   {
     settings.setValue( "/Themes", "default" );
@@ -618,6 +577,25 @@
     settings.setValue( "/Themes", cmbTheme->currentText() );
   }
 
+  //image creation options
+  QString imageCreationString = mImageCreationOptionsLineEdit->toPlainText();
+  QStringList imageCreationOptions = imageCreationString.split( "\n" );
+
+  QMap< QString, QVariant > imageCreationMap;
+  QStringList::const_iterator optionIt = imageCreationOptions.constBegin();
+  for ( ; optionIt != imageCreationOptions.constEnd(); ++optionIt )
+  {
+    QStringList equalSplit = optionIt->split( "=" );
+    if ( equalSplit.size() > 1 )
+    {
+      QString option = equalSplit.at( 0 ).trimmed();
+      QString value = equalSplit.at( 1 ).trimmed();
+      imageCreationMap.insert( option, value );
+    }
+
+  }
+  settings.setValue( "/qgis/imageCreationOptions", imageCreationMap );
+
   settings.setValue( "/IconSize", cmbSize->currentText() );
 
   settings.setValue( "/Map/updateThreshold", spinBoxUpdateThreshold->value() );
Index: src/app/qgisapp.cpp
===================================================================
--- src/app/qgisapp.cpp	(Revision 15531)
+++ src/app/qgisapp.cpp	(Arbeitskopie)
@@ -2643,10 +2643,15 @@
   QgsRasterCalcDialog d;
   if ( d.exec() == QDialog::Accepted )
   {
-    //invoke analysis library
-    //extent and output resolution will come later...
-    QgsRasterCalculator rc( d.formulaString(), d.outputFile(), d.outputFormat(), d.outputRectangle(), d.numberOfColumns(), d.numberOfRows(), d.rasterEntries() );
+    //read image creation options from settings
+    QSettings settings;
+    QMap<QString, QVariant> defaultImageCreationMap;
+    defaultImageCreationMap.insert( "COMPRESS", "PACKBITS" );
+    defaultImageCreationMap.insert( "BIGTIFF", "IF_NEEDED" );
+    QMap<QString, QVariant> imageCreationOptions = settings.value( "/qgis/imageCreationOptions", QVariant( defaultImageCreationMap ) ).toMap();
 
+    QgsRasterCalculator rc( d.formulaString(), d.outputFile(), d.outputFormat(), d.outputRectangle(), d.numberOfColumns(), d.numberOfRows(), d.rasterEntries(), imageCreationOptions );
+
     QProgressDialog p( tr( "Calculating..." ), tr( "Abort..." ), 0, 0 );
     p.setWindowModality( Qt::WindowModal );
     if ( rc.processCalculation( &p ) == 0 )
Index: src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.cpp
===================================================================
--- src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.cpp	(Revision 15531)
+++ src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.cpp	(Arbeitskopie)
@@ -27,6 +27,7 @@
 #include "qgsrasterterrainanalysisdialog.h"
 #include <QAction>
 #include <QProgressDialog>
+#include <QSettings>
 
 static const QString name_ = QObject::tr( "Raster Terrain Analysis plugin" );
 static const QString description_ = QObject::tr( "A plugin for raster based terrain analysis" );
@@ -84,22 +85,29 @@
     QString outputFile = d.selectedOuputFilePath();
     int returnValue;
 
+    //image creation options
+    QSettings settings;
+    QMap<QString, QVariant> defaultImageCreationMap;
+    defaultImageCreationMap.insert( "COMPRESS", "PACKBITS" );
+    defaultImageCreationMap.insert( "BIGTIFF", "IF_NEEDED" );
+    QMap<QString, QVariant> imageCreationOptions = settings.value( "/qgis/imageCreationOptions", QVariant( defaultImageCreationMap ) ).toMap();
+
     QgsNineCellFilter* filter = 0;
     if ( d.selectedAnalysisMethod() == tr( "Slope" ) )
     {
-      filter = new QgsSlopeFilter( inputFilePath, outputFile, selectedFormat );
+      filter = new QgsSlopeFilter( inputFilePath, outputFile, selectedFormat, imageCreationOptions );
     }
     else if ( d.selectedAnalysisMethod() == tr( "Aspect" ) )
     {
-      filter = new QgsAspectFilter( inputFilePath, outputFile, selectedFormat );
+      filter = new QgsAspectFilter( inputFilePath, outputFile, selectedFormat, imageCreationOptions );
     }
     else if ( d.selectedAnalysisMethod() == tr( "Ruggedness index" ) )
     {
-      filter = new QgsRuggednessFilter( inputFilePath, outputFile, selectedFormat );
+      filter = new QgsRuggednessFilter( inputFilePath, outputFile, selectedFormat, imageCreationOptions );
     }
     else if ( d.selectedAnalysisMethod() == tr( "Total curvature" ) )
     {
-      filter = new QgsTotalCurvatureFilter( inputFilePath, outputFile, selectedFormat );
+      filter = new QgsTotalCurvatureFilter( inputFilePath, outputFile, selectedFormat, imageCreationOptions );
     }
 
     if ( filter )
Index: src/analysis/raster/qgsaspectfilter.cpp
===================================================================
--- src/analysis/raster/qgsaspectfilter.cpp	(Revision 15531)
+++ src/analysis/raster/qgsaspectfilter.cpp	(Arbeitskopie)
@@ -17,8 +17,8 @@
 
 #include "qgsaspectfilter.h"
 
-QgsAspectFilter::QgsAspectFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat ) :
-    QgsDerivativeFilter( inputFile, outputFile, outputFormat )
+QgsAspectFilter::QgsAspectFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat, const QMap< QString, QVariant >& creationOptionsMap ) :
+    QgsDerivativeFilter( inputFile, outputFile, outputFormat, creationOptionsMap )
 {
 
 }
Index: src/analysis/raster/qgsslopefilter.cpp
===================================================================
--- src/analysis/raster/qgsslopefilter.cpp	(Revision 15531)
+++ src/analysis/raster/qgsslopefilter.cpp	(Arbeitskopie)
@@ -17,8 +17,8 @@
 
 #include "qgsslopefilter.h"
 
-QgsSlopeFilter::QgsSlopeFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat ): \
-    QgsDerivativeFilter( inputFile, outputFile, outputFormat )
+QgsSlopeFilter::QgsSlopeFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat, const QMap< QString, QVariant >& creationOptionsMap ): \
+    QgsDerivativeFilter( inputFile, outputFile, outputFormat, creationOptionsMap )
 {
 
 }
Index: src/analysis/raster/qgstotalcurvaturefilter.cpp
===================================================================
--- src/analysis/raster/qgstotalcurvaturefilter.cpp	(Revision 15531)
+++ src/analysis/raster/qgstotalcurvaturefilter.cpp	(Arbeitskopie)
@@ -17,8 +17,8 @@
 
 #include "qgstotalcurvaturefilter.h"
 
-QgsTotalCurvatureFilter::QgsTotalCurvatureFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat ): \
-    QgsNineCellFilter( inputFile, outputFile, outputFormat )
+QgsTotalCurvatureFilter::QgsTotalCurvatureFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat, const QMap< QString, QVariant >& creationOptionsMap ): \
+    QgsNineCellFilter( inputFile, outputFile, outputFormat, creationOptionsMap )
 {
 
 }
Index: src/analysis/raster/qgsaspectfilter.h
===================================================================
--- src/analysis/raster/qgsaspectfilter.h	(Revision 15531)
+++ src/analysis/raster/qgsaspectfilter.h	(Arbeitskopie)
@@ -24,7 +24,7 @@
 class ANALYSIS_EXPORT QgsAspectFilter: public QgsDerivativeFilter
 {
   public:
-    QgsAspectFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat );
+    QgsAspectFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat, const QMap< QString, QVariant >& creationOptionsMap );
     ~QgsAspectFilter();
 
   protected:
Index: src/analysis/raster/qgsslopefilter.h
===================================================================
--- src/analysis/raster/qgsslopefilter.h	(Revision 15531)
+++ src/analysis/raster/qgsslopefilter.h	(Arbeitskopie)
@@ -24,7 +24,7 @@
 class ANALYSIS_EXPORT QgsSlopeFilter: public QgsDerivativeFilter
 {
   public:
-    QgsSlopeFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat );
+    QgsSlopeFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat, const QMap< QString, QVariant >& creationOptionsMap );
     ~QgsSlopeFilter();
 
   protected:
Index: src/analysis/raster/qgstotalcurvaturefilter.h
===================================================================
--- src/analysis/raster/qgstotalcurvaturefilter.h	(Revision 15531)
+++ src/analysis/raster/qgstotalcurvaturefilter.h	(Arbeitskopie)
@@ -24,7 +24,7 @@
 class ANALYSIS_EXPORT QgsTotalCurvatureFilter: public QgsNineCellFilter
 {
   public:
-    QgsTotalCurvatureFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat );
+    QgsTotalCurvatureFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat, const QMap< QString, QVariant >& creationOptionsMap );
     ~QgsTotalCurvatureFilter();
 
   protected:
Index: src/analysis/raster/qgsninecellfilter.cpp
===================================================================
--- src/analysis/raster/qgsninecellfilter.cpp	(Revision 15531)
+++ src/analysis/raster/qgsninecellfilter.cpp	(Arbeitskopie)
@@ -25,8 +25,9 @@
 #define TO8(x) (x).toLocal8Bit().constData()
 #endif
 
-QgsNineCellFilter::QgsNineCellFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat ): \
-    mInputFile( inputFile ), mOutputFile( outputFile ), mOutputFormat( outputFormat ), mCellSizeX( -1 ), mCellSizeY( -1 ), mInputNodataValue( -1 ), mOutputNodataValue( -1 )
+QgsNineCellFilter::QgsNineCellFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat, const QMap< QString, QVariant >& creationOptionsMap ): \
+    mInputFile( inputFile ), mOutputFile( outputFile ), mOutputFormat( outputFormat ), mCellSizeX( -1 ), mCellSizeY( -1 ), mInputNodataValue( -1 ), mOutputNodataValue( -1 ),
+    mCreationOptionsMap( creationOptionsMap )
 {
 
 }
@@ -244,8 +245,13 @@
   int ySize = GDALGetRasterYSize( inputDataset );;
 
   //open output file
-  char **papszOptions = NULL;
-  GDALDatasetH outputDataset = GDALCreate( outputDriver, mOutputFile.toLocal8Bit().data(), xSize, ySize, 1, GDT_Float32, papszOptions );
+  char** rasterCreationOptions = 0;
+  QMap< QString, QVariant >::const_iterator optionIt = mCreationOptionsMap.constBegin();
+  for ( ; optionIt != mCreationOptionsMap.constEnd(); ++optionIt )
+  {
+    rasterCreationOptions = CSLSetNameValue( rasterCreationOptions, optionIt.key().toLocal8Bit().data(), optionIt.value().toString().toLocal8Bit().data() );
+  }
+  GDALDatasetH outputDataset = GDALCreate( outputDriver, mOutputFile.toLocal8Bit().data(), xSize, ySize, 1, GDT_Float32, rasterCreationOptions );
   if ( outputDataset == NULL )
   {
     return outputDataset;
Index: src/analysis/raster/qgsninecellfilter.h
===================================================================
--- src/analysis/raster/qgsninecellfilter.h	(Revision 15531)
+++ src/analysis/raster/qgsninecellfilter.h	(Arbeitskopie)
@@ -18,7 +18,9 @@
 #ifndef QGSNINECELLFILTER_H
 #define QGSNINECELLFILTER_H
 
+#include <QMap>
 #include <QString>
+#include <QVariant>
 #include "gdal.h"
 
 class QProgressDialog;
@@ -31,7 +33,7 @@
 {
   public:
     /**Constructor that takes input file, output file and output format (GDAL string)*/
-    QgsNineCellFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat );
+    QgsNineCellFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat, const QMap< QString, QVariant >& creationOptionsMap = QMap< QString, QVariant>() );
     virtual ~QgsNineCellFilter();
     /**Starts the calculation, reads from mInputFile and stores the result in mOutputFile
       @param p progress dialog that receives update and that is checked for abort. 0 if no progress bar is needed.
@@ -67,6 +69,8 @@
     float mInputNodataValue;
     /**The nodata value of the output layer*/
     float mOutputNodataValue;
+    /**Image creation options*/
+    QMap< QString, QVariant > mCreationOptionsMap;
 };
 
 #endif // QGSNINECELLFILTER_H
Index: src/analysis/raster/qgsderivativefilter.cpp
===================================================================
--- src/analysis/raster/qgsderivativefilter.cpp	(Revision 15531)
+++ src/analysis/raster/qgsderivativefilter.cpp	(Arbeitskopie)
@@ -17,8 +17,8 @@
 
 #include "qgsderivativefilter.h"
 
-QgsDerivativeFilter::QgsDerivativeFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat ): \
-    QgsNineCellFilter( inputFile, outputFile, outputFormat )
+QgsDerivativeFilter::QgsDerivativeFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat, const QMap< QString, QVariant >& creationOptionsMap ): \
+    QgsNineCellFilter( inputFile, outputFile, outputFormat, creationOptionsMap )
 {
 
 }
Index: src/analysis/raster/qgsrastercalculator.cpp
===================================================================
--- src/analysis/raster/qgsrastercalculator.cpp	(Revision 15531)
+++ src/analysis/raster/qgsrastercalculator.cpp	(Arbeitskopie)
@@ -31,8 +31,10 @@
 #endif
 
 QgsRasterCalculator::QgsRasterCalculator( const QString& formulaString, const QString& outputFile, const QString& outputFormat,
-    const QgsRectangle& outputExtent, int nOutputColumns, int nOutputRows, const QVector<QgsRasterCalculatorEntry>& rasterEntries ): mFormulaString( formulaString ), mOutputFile( outputFile ), mOutputFormat( outputFormat ),
-    mOutputRectangle( outputExtent ), mNumOutputColumns( nOutputColumns ), mNumOutputRows( nOutputRows ), mRasterEntries( rasterEntries )
+    const QgsRectangle& outputExtent, int nOutputColumns, int nOutputRows, const QVector<QgsRasterCalculatorEntry>& rasterEntries,
+    const QMap< QString, QVariant >& rasterCreationOptions ): mFormulaString( formulaString ), mOutputFile( outputFile ), mOutputFormat( outputFormat ),
+    mOutputRectangle( outputExtent ), mNumOutputColumns( nOutputColumns ), mNumOutputRows( nOutputRows ), mRasterEntries( rasterEntries ),
+    mRasterCreationOptions( rasterCreationOptions )
 {
 }
 
@@ -247,9 +249,13 @@
 
 GDALDatasetH QgsRasterCalculator::openOutputFile( GDALDriverH outputDriver )
 {
-  //open output file
-  char **papszOptions = NULL;
-  GDALDatasetH outputDataset = GDALCreate( outputDriver, mOutputFile.toLocal8Bit().data(), mNumOutputColumns, mNumOutputRows, 1, GDT_Float32, papszOptions );
+  char** rasterCreationOptions = 0;
+  QMap< QString, QVariant >::const_iterator optionIt = mRasterCreationOptions.constBegin();
+  for ( ; optionIt != mRasterCreationOptions.constEnd(); ++optionIt )
+  {
+    rasterCreationOptions = CSLSetNameValue( rasterCreationOptions, optionIt.key().toLocal8Bit().data(), optionIt.value().toString().toLocal8Bit().data() );
+  }
+  GDALDatasetH outputDataset = GDALCreate( outputDriver, mOutputFile.toLocal8Bit().data(), mNumOutputColumns, mNumOutputRows, 1, GDT_Float32, rasterCreationOptions );
   if ( outputDataset == NULL )
   {
     return outputDataset;
Index: src/analysis/raster/qgsruggednessfilter.cpp
===================================================================
--- src/analysis/raster/qgsruggednessfilter.cpp	(Revision 15531)
+++ src/analysis/raster/qgsruggednessfilter.cpp	(Arbeitskopie)
@@ -17,7 +17,8 @@
 
 #include "qgsruggednessfilter.h"
 
-QgsRuggednessFilter::QgsRuggednessFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat ): QgsNineCellFilter( inputFile, outputFile, outputFormat )
+QgsRuggednessFilter::QgsRuggednessFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat, const QMap< QString, QVariant >& creationOptionsMap ):
+    QgsNineCellFilter( inputFile, outputFile, outputFormat, creationOptionsMap )
 {
 
 }
Index: src/analysis/raster/qgsderivativefilter.h
===================================================================
--- src/analysis/raster/qgsderivativefilter.h	(Revision 15531)
+++ src/analysis/raster/qgsderivativefilter.h	(Arbeitskopie)
@@ -24,7 +24,7 @@
 class QgsDerivativeFilter: public QgsNineCellFilter
 {
   public:
-    QgsDerivativeFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat );
+    QgsDerivativeFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat, const QMap< QString, QVariant >& creationOptionsMap );
     virtual ~QgsDerivativeFilter();
     //to be implemented by subclasses
     virtual float processNineCellWindow( float* x11, float* x21, float* x31, float* x12, float* x22, \
Index: src/analysis/raster/qgsrastercalculator.h
===================================================================
--- src/analysis/raster/qgsrastercalculator.h	(Revision 15531)
+++ src/analysis/raster/qgsrastercalculator.h	(Arbeitskopie)
@@ -40,7 +40,8 @@
 {
   public:
     QgsRasterCalculator( const QString& formulaString, const QString& outputFile, const QString& outputFormat,
-                         const QgsRectangle& outputExtent, int nOutputColumns, int nOutputRows, const QVector<QgsRasterCalculatorEntry>& rasterEntries );
+                         const QgsRectangle& outputExtent, int nOutputColumns, int nOutputRows, const QVector<QgsRasterCalculatorEntry>& rasterEntries,
+                         const QMap< QString, QVariant >& rasterCreationOptions = QMap< QString, QVariant >() );
     ~QgsRasterCalculator();
 
     /**Starts the calculation and writes new raster
@@ -98,6 +99,8 @@
 
     /***/
     QVector<QgsRasterCalculatorEntry> mRasterEntries;
+
+    QMap< QString, QVariant > mRasterCreationOptions;
 };
 
 #endif // QGSRASTERCALCULATOR_H
Index: src/analysis/raster/qgsruggednessfilter.h
===================================================================
--- src/analysis/raster/qgsruggednessfilter.h	(Revision 15531)
+++ src/analysis/raster/qgsruggednessfilter.h	(Arbeitskopie)
@@ -25,7 +25,7 @@
 class ANALYSIS_EXPORT QgsRuggednessFilter: public QgsNineCellFilter
 {
   public:
-    QgsRuggednessFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat );
+    QgsRuggednessFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat, const QMap< QString, QVariant >& creationOptionsMap );
     ~QgsRuggednessFilter();
 
   protected:
Index: src/ui/qgsoptionsbase.ui
===================================================================
--- src/ui/qgsoptionsbase.ui	(Revision 15531)
+++ src/ui/qgsoptionsbase.ui	(Arbeitskopie)
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>825</width>
-    <height>503</height>
+    <width>775</width>
+    <height>513</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -33,7 +33,7 @@
    <item row="2" column="0">
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>2</number>
      </property>
      <property name="iconSize">
       <size>
@@ -60,8 +60,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>780</width>
-            <height>755</height>
+            <width>715</width>
+            <height>766</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_12">
@@ -499,8 +499,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>780</width>
-            <height>433</height>
+            <width>731</width>
+            <height>475</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_8">
@@ -659,7 +659,7 @@
       <attribute name="title">
        <string>Map tools</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_6">
+      <layout class="QGridLayout" name="gridLayout_10">
        <item row="0" column="0">
         <widget class="QScrollArea" name="scrollArea">
          <property name="widgetResizable">
@@ -669,12 +669,12 @@
           <property name="geometry">
            <rect>
             <x>0</x>
-            <y>0</y>
-            <width>780</width>
-            <height>456</height>
+            <y>-281</y>
+            <width>715</width>
+            <height>685</height>
            </rect>
           </property>
-          <layout class="QGridLayout" name="gridLayout_4">
+          <layout class="QGridLayout" name="gridLayout_6">
            <item row="0" column="0">
             <widget class="QGroupBox" name="groupBox_7">
              <property name="title">
@@ -925,81 +925,18 @@
              </layout>
             </widget>
            </item>
-          </layout>
-         </widget>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tabWidgetPage4">
-      <attribute name="icon">
-       <iconset resource="../../images/images.qrc">
-        <normaloff>:/images/themes/default/propertyicons/overlay.png</normaloff>:/images/themes/default/propertyicons/overlay.png</iconset>
-      </attribute>
-      <attribute name="title">
-       <string>Overlays</string>
-      </attribute>
-      <layout class="QGridLayout" name="gridLayout_11">
-       <item row="0" column="0">
-        <widget class="QScrollArea" name="scrollArea_4">
-         <property name="widgetResizable">
-          <bool>true</bool>
-         </property>
-         <widget class="QWidget" name="scrollAreaWidgetContents_5">
-          <property name="geometry">
-           <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>795</width>
-            <height>415</height>
-           </rect>
-          </property>
-          <layout class="QGridLayout" name="gridLayout_10">
-           <item row="0" column="0">
-            <widget class="QGroupBox" name="mPositionGroupBox">
+           <item row="3" column="0">
+            <widget class="QGroupBox" name="mImageCreationOptionsGroupBox">
              <property name="title">
-              <string>Position</string>
+              <string>Image creation options</string>
              </property>
-             <layout class="QHBoxLayout" name="horizontalLayout_4">
-              <item>
-               <widget class="QLabel" name="mAlgorithmLabel">
-                <property name="text">
-                 <string>Placement algorithm</string>
-                </property>
-               </widget>
+             <layout class="QGridLayout" name="gridLayout_4">
+              <item row="0" column="0">
+               <widget class="QTextEdit" name="mImageCreationOptionsLineEdit"/>
               </item>
-              <item>
-               <spacer>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>221</width>
-                  <height>20</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-              <item>
-               <widget class="QComboBox" name="mOverlayAlgorithmComboBox"/>
-              </item>
              </layout>
             </widget>
            </item>
-           <item row="1" column="0">
-            <spacer>
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>461</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
           </layout>
          </widget>
         </widget>
@@ -1025,8 +962,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>795</width>
-            <height>415</height>
+            <width>731</width>
+            <height>422</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_13">
@@ -1355,8 +1292,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>795</width>
-            <height>415</height>
+            <width>731</width>
+            <height>404</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_15">
@@ -1523,8 +1460,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>780</width>
-            <height>527</height>
+            <width>731</width>
+            <height>546</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_17">
@@ -1614,8 +1551,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>780</width>
-            <height>461</height>
+            <width>731</width>
+            <height>520</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_20">
@@ -1894,8 +1831,6 @@
   <tabstop>mGonRadioButton</tabstop>
   <tabstop>cmbWheelAction</tabstop>
   <tabstop>spinZoomFactor</tabstop>
-  <tabstop>scrollArea_4</tabstop>
-  <tabstop>mOverlayAlgorithmComboBox</tabstop>
   <tabstop>scrollArea_5</tabstop>
   <tabstop>mLineWidthSpinBox</tabstop>
   <tabstop>mLineColorToolButton</tabstop>