diff --git a/src/warchron/view/ui/ui_settings_dialog.py b/src/warchron/view/ui/ui_settings_dialog.py
index bf0f161..d051846 100644
--- a/src/warchron/view/ui/ui_settings_dialog.py
+++ b/src/warchron/view/ui/ui_settings_dialog.py
@@ -13,7 +13,7 @@ class Ui_settingsDialog(object):
     def setupUi(self, settingsDialog):
         settingsDialog.setObjectName("settingsDialog")
         settingsDialog.setWindowModality(QtCore.Qt.WindowModality.ApplicationModal)
-        settingsDialog.resize(661, 377)
+        settingsDialog.resize(621, 387)
         icon = QtGui.QIcon()
         icon.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/warchron_logo.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off)
         settingsDialog.setWindowIcon(icon)
@@ -24,8 +24,8 @@ class Ui_settingsDialog(object):
         font.setPointSize(10)
         self.groupBox_2.setFont(font)
         self.groupBox_2.setObjectName("groupBox_2")
-        self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.groupBox_2)
-        self.verticalLayout_2.setObjectName("verticalLayout_2")
+        self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.groupBox_2)
+        self.verticalLayout_3.setObjectName("verticalLayout_3")
         self.horizontalLayout = QtWidgets.QHBoxLayout()
         self.horizontalLayout.setObjectName("horizontalLayout")
         self.label_5 = QtWidgets.QLabel(parent=self.groupBox_2)
@@ -56,25 +56,58 @@ class Ui_settingsDialog(object):
         self.horizontalLayout.addWidget(self.label_15)
         spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
         self.horizontalLayout.addItem(spacerItem1)
-        self.verticalLayout_2.addLayout(self.horizontalLayout)
-        self.horizontalLayout_5 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_5.setObjectName("horizontalLayout_5")
+        self.verticalLayout_3.addLayout(self.horizontalLayout)
+        self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
         self.label_12 = QtWidgets.QLabel(parent=self.groupBox_2)
         self.label_12.setObjectName("label_12")
-        self.horizontalLayout_5.addWidget(self.label_12)
-        self.rankingComboBox = QtWidgets.QComboBox(parent=self.groupBox_2)
-        self.rankingComboBox.setEnabled(False)
+        self.horizontalLayout_2.addWidget(self.label_12)
+        self.pointsComboBox = QtWidgets.QComboBox(parent=self.groupBox_2)
+        self.pointsComboBox.setEnabled(False)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.rankingComboBox.sizePolicy().hasHeightForWidth())
-        self.rankingComboBox.setSizePolicy(sizePolicy)
-        self.rankingComboBox.setObjectName("rankingComboBox")
-        self.rankingComboBox.addItem("")
-        self.horizontalLayout_5.addWidget(self.rankingComboBox)
+        sizePolicy.setHeightForWidth(self.pointsComboBox.sizePolicy().hasHeightForWidth())
+        self.pointsComboBox.setSizePolicy(sizePolicy)
+        self.pointsComboBox.setObjectName("pointsComboBox")
+        self.pointsComboBox.addItem("")
+        self.pointsComboBox.addItem("")
+        self.horizontalLayout_2.addWidget(self.pointsComboBox)
         spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
-        self.horizontalLayout_5.addItem(spacerItem2)
-        self.verticalLayout_2.addLayout(self.horizontalLayout_5)
+        self.horizontalLayout_2.addItem(spacerItem2)
+        self.internalTiebreak = QtWidgets.QCheckBox(parent=self.groupBox_2)
+        self.internalTiebreak.setEnabled(False)
+        self.internalTiebreak.setText("")
+        self.internalTiebreak.setCheckable(True)
+        self.internalTiebreak.setChecked(True)
+        self.internalTiebreak.setObjectName("internalTiebreak")
+        self.horizontalLayout_2.addWidget(self.internalTiebreak)
+        self.label_20 = QtWidgets.QLabel(parent=self.groupBox_2)
+        self.label_20.setObjectName("label_20")
+        self.horizontalLayout_2.addWidget(self.label_20)
+        spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_2.addItem(spacerItem3)
+        self.verticalLayout_3.addLayout(self.horizontalLayout_2)
+        self.horizontalLayout_5 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_5.setObjectName("horizontalLayout_5")
+        self.label_19 = QtWidgets.QLabel(parent=self.groupBox_2)
+        self.label_19.setObjectName("label_19")
+        self.horizontalLayout_5.addWidget(self.label_19)
+        self.rankingComboBox_2 = QtWidgets.QComboBox(parent=self.groupBox_2)
+        self.rankingComboBox_2.setEnabled(False)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.rankingComboBox_2.sizePolicy().hasHeightForWidth())
+        self.rankingComboBox_2.setSizePolicy(sizePolicy)
+        self.rankingComboBox_2.setObjectName("rankingComboBox_2")
+        self.rankingComboBox_2.addItem("")
+        self.rankingComboBox_2.addItem("")
+        self.rankingComboBox_2.addItem("")
+        self.horizontalLayout_5.addWidget(self.rankingComboBox_2)
+        spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_5.addItem(spacerItem4)
+        self.verticalLayout_3.addLayout(self.horizontalLayout_5)
         self.verticalLayout_4.addWidget(self.groupBox_2)
         self.groupBox = QtWidgets.QGroupBox(parent=settingsDialog)
         font = QtGui.QFont()
@@ -95,8 +128,8 @@ class Ui_settingsDialog(object):
         self.label_8 = QtWidgets.QLabel(parent=self.groupBox)
         self.label_8.setObjectName("label_8")
         self.horizontalLayout_3.addWidget(self.label_8)
-        spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
-        self.horizontalLayout_3.addItem(spacerItem3)
+        spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_3.addItem(spacerItem5)
         self.label_9 = QtWidgets.QLabel(parent=self.groupBox)
         self.label_9.setObjectName("label_9")
         self.horizontalLayout_3.addWidget(self.label_9)
@@ -107,8 +140,8 @@ class Ui_settingsDialog(object):
         self.label_10 = QtWidgets.QLabel(parent=self.groupBox)
         self.label_10.setObjectName("label_10")
         self.horizontalLayout_3.addWidget(self.label_10)
-        spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
-        self.horizontalLayout_3.addItem(spacerItem4)
+        spacerItem6 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_3.addItem(spacerItem6)
         self.verticalLayout.addLayout(self.horizontalLayout_3)
         self.horizontalLayout_4 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_4.setObjectName("horizontalLayout_4")
@@ -121,8 +154,8 @@ class Ui_settingsDialog(object):
         self.influenceToken.setChecked(True)
         self.influenceToken.setObjectName("influenceToken")
         self.horizontalLayout_4.addWidget(self.influenceToken)
-        spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
-        self.horizontalLayout_4.addItem(spacerItem5)
+        spacerItem7 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_4.addItem(spacerItem7)
         self.verticalLayout.addLayout(self.horizontalLayout_4)
         self.verticalLayout_4.addWidget(self.groupBox)
         self.groupBox_3 = QtWidgets.QGroupBox(parent=settingsDialog)
@@ -130,13 +163,45 @@ class Ui_settingsDialog(object):
         font.setPointSize(10)
         self.groupBox_3.setFont(font)
         self.groupBox_3.setObjectName("groupBox_3")
-        self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.groupBox_3)
-        self.verticalLayout_3.setObjectName("verticalLayout_3")
+        self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.groupBox_3)
+        self.verticalLayout_2.setObjectName("verticalLayout_2")
         self.horizontalLayout_7 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_7.setObjectName("horizontalLayout_7")
+        self.label_21 = QtWidgets.QLabel(parent=self.groupBox_3)
+        self.label_21.setObjectName("label_21")
+        self.horizontalLayout_7.addWidget(self.label_21)
+        self.drawComboBox = QtWidgets.QComboBox(parent=self.groupBox_3)
+        self.drawComboBox.setEnabled(False)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.drawComboBox.sizePolicy().hasHeightForWidth())
+        self.drawComboBox.setSizePolicy(sizePolicy)
+        self.drawComboBox.setObjectName("drawComboBox")
+        self.drawComboBox.addItem("")
+        self.drawComboBox.addItem("")
+        self.drawComboBox.addItem("")
+        self.horizontalLayout_7.addWidget(self.drawComboBox)
+        spacerItem8 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_7.addItem(spacerItem8)
+        self.label_18 = QtWidgets.QLabel(parent=self.groupBox_3)
+        self.label_18.setObjectName("label_18")
+        self.horizontalLayout_7.addWidget(self.label_18)
+        self.shuffle = QtWidgets.QCheckBox(parent=self.groupBox_3)
+        self.shuffle.setEnabled(False)
+        self.shuffle.setText("")
+        self.shuffle.setCheckable(True)
+        self.shuffle.setChecked(True)
+        self.shuffle.setObjectName("shuffle")
+        self.horizontalLayout_7.addWidget(self.shuffle)
+        spacerItem9 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_7.addItem(spacerItem9)
+        self.verticalLayout_2.addLayout(self.horizontalLayout_7)
+        self.horizontalLayout_8 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_8.setObjectName("horizontalLayout_8")
         self.label_17 = QtWidgets.QLabel(parent=self.groupBox_3)
         self.label_17.setObjectName("label_17")
-        self.horizontalLayout_7.addWidget(self.label_17)
+        self.horizontalLayout_8.addWidget(self.label_17)
         self.fallbackComboBox = QtWidgets.QComboBox(parent=self.groupBox_3)
         self.fallbackComboBox.setEnabled(False)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Fixed)
@@ -146,22 +211,11 @@ class Ui_settingsDialog(object):
         self.fallbackComboBox.setSizePolicy(sizePolicy)
         self.fallbackComboBox.setObjectName("fallbackComboBox")
         self.fallbackComboBox.addItem("")
-        self.horizontalLayout_7.addWidget(self.fallbackComboBox)
-        spacerItem6 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
-        self.horizontalLayout_7.addItem(spacerItem6)
-        self.label_18 = QtWidgets.QLabel(parent=self.groupBox_3)
-        self.label_18.setObjectName("label_18")
-        self.horizontalLayout_7.addWidget(self.label_18)
-        self.influenceToken_2 = QtWidgets.QCheckBox(parent=self.groupBox_3)
-        self.influenceToken_2.setEnabled(False)
-        self.influenceToken_2.setText("")
-        self.influenceToken_2.setCheckable(True)
-        self.influenceToken_2.setChecked(True)
-        self.influenceToken_2.setObjectName("influenceToken_2")
-        self.horizontalLayout_7.addWidget(self.influenceToken_2)
-        spacerItem7 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
-        self.horizontalLayout_7.addItem(spacerItem7)
-        self.verticalLayout_3.addLayout(self.horizontalLayout_7)
+        self.fallbackComboBox.addItem("")
+        self.horizontalLayout_8.addWidget(self.fallbackComboBox)
+        spacerItem10 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_8.addItem(spacerItem10)
+        self.verticalLayout_2.addLayout(self.horizontalLayout_8)
         self.horizontalLayout_6 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_6.setObjectName("horizontalLayout_6")
         self.label_13 = QtWidgets.QLabel(parent=self.groupBox_3)
@@ -172,8 +226,8 @@ class Ui_settingsDialog(object):
         self.rematchValue.setMinimum(1)
         self.rematchValue.setObjectName("rematchValue")
         self.horizontalLayout_6.addWidget(self.rematchValue)
-        spacerItem8 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
-        self.horizontalLayout_6.addItem(spacerItem8)
+        spacerItem11 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_6.addItem(spacerItem11)
         self.label_16 = QtWidgets.QLabel(parent=self.groupBox_3)
         self.label_16.setObjectName("label_16")
         self.horizontalLayout_6.addWidget(self.label_16)
@@ -182,9 +236,9 @@ class Ui_settingsDialog(object):
         self.occupancyValue.setMinimum(1)
         self.occupancyValue.setObjectName("occupancyValue")
         self.horizontalLayout_6.addWidget(self.occupancyValue)
-        spacerItem9 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
-        self.horizontalLayout_6.addItem(spacerItem9)
-        self.verticalLayout_3.addLayout(self.horizontalLayout_6)
+        spacerItem12 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_6.addItem(spacerItem12)
+        self.verticalLayout_2.addLayout(self.horizontalLayout_6)
         self.verticalLayout_4.addWidget(self.groupBox_3)
         self.buttonBox = QtWidgets.QDialogButtonBox(parent=settingsDialog)
         self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
@@ -205,8 +259,14 @@ class Ui_settingsDialog(object):
         self.label_14.setText(_translate("settingsDialog", "victory points"))
         self.label_6.setText(_translate("settingsDialog", "Draw"))
         self.label_15.setText(_translate("settingsDialog", "victory points"))
-        self.label_12.setText(_translate("settingsDialog", "Ranking mode"))
-        self.rankingComboBox.setItemText(0, _translate("settingsDialog", "Sum points & tie-breaks"))
+        self.label_12.setText(_translate("settingsDialog", "War points mode"))
+        self.pointsComboBox.setItemText(0, _translate("settingsDialog", "Sum battle points"))
+        self.pointsComboBox.setItemText(1, _translate("settingsDialog", "Sum campaign ranking"))
+        self.label_20.setText(_translate("settingsDialog", "Count internal tie-breaks"))
+        self.label_19.setText(_translate("settingsDialog", "Ranking mode"))
+        self.rankingComboBox_2.setItemText(0, _translate("settingsDialog", "Dense (1-2-2-3)"))
+        self.rankingComboBox_2.setItemText(1, _translate("settingsDialog", "Shift-up (1-2-2-4)"))
+        self.rankingComboBox_2.setItemText(2, _translate("settingsDialog", "Shift-down (1-3-3-4)"))
         self.groupBox.setTitle(_translate("settingsDialog", "Objectives"))
         self.label_4.setText(_translate("settingsDialog", "Major objective"))
         self.label_8.setText(_translate("settingsDialog", "narrative points"))
@@ -215,9 +275,14 @@ class Ui_settingsDialog(object):
         self.label_11.setText(_translate("settingsDialog", "Underlying influence"))
         self.influenceToken.setText(_translate("settingsDialog", "Token"))
         self.groupBox_3.setTitle(_translate("settingsDialog", "Pairing"))
+        self.label_21.setText(_translate("settingsDialog", "Draw priority"))
+        self.drawComboBox.setItemText(0, _translate("settingsDialog", "Best war ranking"))
+        self.drawComboBox.setItemText(1, _translate("settingsDialog", "Random"))
+        self.drawComboBox.setItemText(2, _translate("settingsDialog", "Avoid rematch"))
+        self.label_18.setText(_translate("settingsDialog", "Shuffle groups"))
         self.label_17.setText(_translate("settingsDialog", "Fallback mode"))
-        self.fallbackComboBox.setItemText(0, _translate("settingsDialog", "Best ranking first & avoid rematch"))
-        self.label_18.setText(_translate("settingsDialog", "Shuffle"))
+        self.fallbackComboBox.setItemText(0, _translate("settingsDialog", "Avoid rematch"))
+        self.fallbackComboBox.setItemText(1, _translate("settingsDialog", "Random"))
         self.label_13.setText(_translate("settingsDialog", "Rematch weight"))
         self.label_16.setText(_translate("settingsDialog", "Occupancy weight"))
 
diff --git a/src/warchron/view/ui/ui_settings_dialog.ui b/src/warchron/view/ui/ui_settings_dialog.ui
index 2b371bc..cc251f0 100644
--- a/src/warchron/view/ui/ui_settings_dialog.ui
+++ b/src/warchron/view/ui/ui_settings_dialog.ui
@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>661</width>
-    <height>377</height>
+    <width>621</width>
+    <height>387</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -31,7 +31,7 @@
      <property name="title">
       <string>Scores</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
+     <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
@@ -117,16 +117,16 @@
        </layout>
       </item>
       <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_5">
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
         <item>
          <widget class="QLabel" name="label_12">
           <property name="text">
-           <string>Ranking mode</string>
+           <string>War points mode</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QComboBox" name="rankingComboBox">
+         <widget class="QComboBox" name="pointsComboBox">
           <property name="enabled">
            <bool>false</bool>
           </property>
@@ -138,7 +138,12 @@
           </property>
           <item>
            <property name="text">
-            <string>Sum points &amp; tie-breaks</string>
+            <string>Sum battle points</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Sum campaign ranking</string>
            </property>
           </item>
          </widget>
@@ -156,6 +161,94 @@
           </property>
          </spacer>
         </item>
+        <item>
+         <widget class="QCheckBox" name="internalTiebreak">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="label_20">
+          <property name="text">
+           <string>Count internal tie-breaks</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_18">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_5">
+        <item>
+         <widget class="QLabel" name="label_19">
+          <property name="text">
+           <string>Ranking mode</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QComboBox" name="rankingComboBox_2">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <item>
+           <property name="text">
+            <string>Dense (1-2-2-3)</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Shift-up (1-2-2-4)</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Shift-down (1-3-3-4)</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_5">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
        </layout>
       </item>
      </layout>
@@ -297,9 +390,97 @@
      <property name="title">
       <string>Pairing</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_3">
+     <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout_7">
+        <item>
+         <widget class="QLabel" name="label_21">
+          <property name="text">
+           <string>Draw priority</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QComboBox" name="drawComboBox">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <item>
+           <property name="text">
+            <string>Best war ranking</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Random</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Avoid rematch</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_6">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QLabel" name="label_18">
+          <property name="text">
+           <string>Shuffle groups</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="shuffle">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_17">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_8">
         <item>
          <widget class="QLabel" name="label_17">
           <property name="text">
@@ -320,7 +501,12 @@
           </property>
           <item>
            <property name="text">
-            <string>Best ranking first &amp; avoid rematch</string>
+            <string>Avoid rematch</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Random</string>
            </property>
           </item>
          </widget>
@@ -338,42 +524,6 @@
           </property>
          </spacer>
         </item>
-        <item>
-         <widget class="QLabel" name="label_18">
-          <property name="text">
-           <string>Shuffle</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QCheckBox" name="influenceToken_2">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="checkable">
-           <bool>true</bool>
-          </property>
-          <property name="checked">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_17">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
        </layout>
       </item>
       <item>