diff --git a/src/warchron/view/ui/ui_main_window.py b/src/warchron/view/ui/ui_main_window.py
index 02bff79..c074afa 100644
--- a/src/warchron/view/ui/ui_main_window.py
+++ b/src/warchron/view/ui/ui_main_window.py
@@ -12,14 +12,14 @@ from PyQt6 import QtCore, QtGui, QtWidgets
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
         MainWindow.setObjectName("MainWindow")
-        MainWindow.resize(1288, 817)
+        MainWindow.resize(1235, 954)
         icon = QtGui.QIcon()
         icon.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/warchron_logo.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off)
         MainWindow.setWindowIcon(icon)
         self.centralwidget = QtWidgets.QWidget(parent=MainWindow)
         self.centralwidget.setObjectName("centralwidget")
-        self.verticalLayout = QtWidgets.QVBoxLayout(self.centralwidget)
-        self.verticalLayout.setObjectName("verticalLayout")
+        self.verticalLayout_9 = QtWidgets.QVBoxLayout(self.centralwidget)
+        self.verticalLayout_9.setObjectName("verticalLayout_9")
         self.tabWidget = QtWidgets.QTabWidget(parent=self.centralwidget)
         self.tabWidget.setObjectName("tabWidget")
         self.playersTab = QtWidgets.QWidget()
@@ -35,6 +35,9 @@ class Ui_MainWindow(object):
         self.horizontalLayout.addItem(spacerItem)
         self.gridLayout.addLayout(self.horizontalLayout, 0, 0, 1, 1)
         self.playersTable = QtWidgets.QTableWidget(parent=self.playersTab)
+        self.playersTable.setEnabled(True)
+        self.playersTable.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
+        self.playersTable.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
         self.playersTable.setObjectName("playersTable")
         self.playersTable.setColumnCount(4)
         self.playersTable.setRowCount(0)
@@ -46,6 +49,7 @@ class Ui_MainWindow(object):
         self.playersTable.setHorizontalHeaderItem(2, item)
         item = QtWidgets.QTableWidgetItem()
         self.playersTable.setHorizontalHeaderItem(3, item)
+        self.playersTable.horizontalHeader().setStretchLastSection(True)
         self.gridLayout.addWidget(self.playersTable, 1, 0, 1, 1)
         icon1 = QtGui.QIcon()
         icon1.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/users.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off)
@@ -95,11 +99,106 @@ class Ui_MainWindow(object):
         self.selectedDetailsStack.addWidget(self.pageEmpty)
         self.pageWar = QtWidgets.QWidget()
         self.pageWar.setObjectName("pageWar")
-        self.gridLayout_3 = QtWidgets.QGridLayout(self.pageWar)
-        self.gridLayout_3.setObjectName("gridLayout_3")
-        self.horizontalLayout_10 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_10.setObjectName("horizontalLayout_10")
-        self.warParticipantsTable = QtWidgets.QTableWidget(parent=self.pageWar)
+        self.verticalLayout_10 = QtWidgets.QVBoxLayout(self.pageWar)
+        self.verticalLayout_10.setObjectName("verticalLayout_10")
+        self.horizontalLayout_8 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_8.setObjectName("horizontalLayout_8")
+        self.warName = QtWidgets.QLabel(parent=self.pageWar)
+        font = QtGui.QFont()
+        font.setPointSize(12)
+        self.warName.setFont(font)
+        self.warName.setObjectName("warName")
+        self.horizontalLayout_8.addWidget(self.warName)
+        spacerItem4 = QtWidgets.QSpacerItem(630, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_8.addItem(spacerItem4)
+        self.warYear = QtWidgets.QLabel(parent=self.pageWar)
+        font = QtGui.QFont()
+        font.setPointSize(12)
+        self.warYear.setFont(font)
+        self.warYear.setObjectName("warYear")
+        self.horizontalLayout_8.addWidget(self.warYear)
+        self.verticalLayout_10.addLayout(self.horizontalLayout_8)
+        self.groupBox = QtWidgets.QGroupBox(parent=self.pageWar)
+        self.groupBox.setObjectName("groupBox")
+        self.verticalLayout = QtWidgets.QVBoxLayout(self.groupBox)
+        self.verticalLayout.setObjectName("verticalLayout")
+        self.horizontalLayout_3 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_3.setObjectName("horizontalLayout_3")
+        self.addObjectiveBtn = QtWidgets.QPushButton(parent=self.groupBox)
+        self.addObjectiveBtn.setEnabled(True)
+        font = QtGui.QFont()
+        font.setPointSize(10)
+        self.addObjectiveBtn.setFont(font)
+        self.addObjectiveBtn.setObjectName("addObjectiveBtn")
+        self.horizontalLayout_3.addWidget(self.addObjectiveBtn)
+        spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_3.addItem(spacerItem5)
+        self.label = QtWidgets.QLabel(parent=self.groupBox)
+        self.label.setObjectName("label")
+        self.horizontalLayout_3.addWidget(self.label)
+        self.majorValue = QtWidgets.QSpinBox(parent=self.groupBox)
+        self.majorValue.setMinimum(1)
+        self.majorValue.setObjectName("majorValue")
+        self.horizontalLayout_3.addWidget(self.majorValue)
+        self.label_5 = QtWidgets.QLabel(parent=self.groupBox)
+        self.label_5.setObjectName("label_5")
+        self.horizontalLayout_3.addWidget(self.label_5)
+        spacerItem6 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_3.addItem(spacerItem6)
+        self.label_2 = QtWidgets.QLabel(parent=self.groupBox)
+        self.label_2.setObjectName("label_2")
+        self.horizontalLayout_3.addWidget(self.label_2)
+        self.minorValue = QtWidgets.QSpinBox(parent=self.groupBox)
+        self.minorValue.setMinimum(1)
+        self.minorValue.setObjectName("minorValue")
+        self.horizontalLayout_3.addWidget(self.minorValue)
+        self.label_4 = QtWidgets.QLabel(parent=self.groupBox)
+        self.label_4.setObjectName("label_4")
+        self.horizontalLayout_3.addWidget(self.label_4)
+        spacerItem7 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_3.addItem(spacerItem7)
+        self.label_3 = QtWidgets.QLabel(parent=self.groupBox)
+        self.label_3.setObjectName("label_3")
+        self.horizontalLayout_3.addWidget(self.label_3)
+        self.influenceToken = QtWidgets.QCheckBox(parent=self.groupBox)
+        self.influenceToken.setEnabled(True)
+        self.influenceToken.setCheckable(True)
+        self.influenceToken.setChecked(True)
+        self.influenceToken.setObjectName("influenceToken")
+        self.horizontalLayout_3.addWidget(self.influenceToken)
+        spacerItem8 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_3.addItem(spacerItem8)
+        self.verticalLayout.addLayout(self.horizontalLayout_3)
+        self.objectivesTable = QtWidgets.QTableWidget(parent=self.groupBox)
+        self.objectivesTable.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
+        self.objectivesTable.setAlternatingRowColors(False)
+        self.objectivesTable.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
+        self.objectivesTable.setObjectName("objectivesTable")
+        self.objectivesTable.setColumnCount(2)
+        self.objectivesTable.setRowCount(0)
+        item = QtWidgets.QTableWidgetItem()
+        self.objectivesTable.setHorizontalHeaderItem(0, item)
+        item = QtWidgets.QTableWidgetItem()
+        self.objectivesTable.setHorizontalHeaderItem(1, item)
+        self.objectivesTable.horizontalHeader().setStretchLastSection(True)
+        self.verticalLayout.addWidget(self.objectivesTable)
+        self.verticalLayout_10.addWidget(self.groupBox)
+        self.groupBox_2 = QtWidgets.QGroupBox(parent=self.pageWar)
+        self.groupBox_2.setObjectName("groupBox_2")
+        self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.groupBox_2)
+        self.verticalLayout_2.setObjectName("verticalLayout_2")
+        self.horizontalLayout_5 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_5.setObjectName("horizontalLayout_5")
+        self.addWarParticipantBtn = QtWidgets.QPushButton(parent=self.groupBox_2)
+        self.addWarParticipantBtn.setObjectName("addWarParticipantBtn")
+        self.horizontalLayout_5.addWidget(self.addWarParticipantBtn)
+        spacerItem9 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_5.addItem(spacerItem9)
+        self.verticalLayout_2.addLayout(self.horizontalLayout_5)
+        self.warParticipantsTable = QtWidgets.QTableWidget(parent=self.groupBox_2)
+        self.warParticipantsTable.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
+        self.warParticipantsTable.setAlternatingRowColors(False)
+        self.warParticipantsTable.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
         self.warParticipantsTable.setObjectName("warParticipantsTable")
         self.warParticipantsTable.setColumnCount(5)
         self.warParticipantsTable.setRowCount(0)
@@ -113,134 +212,56 @@ class Ui_MainWindow(object):
         self.warParticipantsTable.setHorizontalHeaderItem(3, item)
         item = QtWidgets.QTableWidgetItem()
         self.warParticipantsTable.setHorizontalHeaderItem(4, item)
-        self.horizontalLayout_10.addWidget(self.warParticipantsTable)
-        self.addWarParticipantBtn = QtWidgets.QPushButton(parent=self.pageWar)
-        self.addWarParticipantBtn.setObjectName("addWarParticipantBtn")
-        self.horizontalLayout_10.addWidget(self.addWarParticipantBtn)
-        self.gridLayout_3.addLayout(self.horizontalLayout_10, 4, 0, 1, 4)
-        self.labelObjectives = QtWidgets.QLabel(parent=self.pageWar)
-        self.labelObjectives.setObjectName("labelObjectives")
-        self.gridLayout_3.addWidget(self.labelObjectives, 1, 0, 1, 1)
+        self.warParticipantsTable.horizontalHeader().setStretchLastSection(True)
+        self.verticalLayout_2.addWidget(self.warParticipantsTable)
+        self.verticalLayout_10.addWidget(self.groupBox_2)
+        self.horizontalLayout_6 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_6.setObjectName("horizontalLayout_6")
+        spacerItem10 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_6.addItem(spacerItem10)
         self.endWarBtn = QtWidgets.QPushButton(parent=self.pageWar)
         self.endWarBtn.setEnabled(True)
         self.endWarBtn.setObjectName("endWarBtn")
-        self.gridLayout_3.addWidget(self.endWarBtn, 5, 1, 1, 1)
-        self.labelParticipants = QtWidgets.QLabel(parent=self.pageWar)
-        self.labelParticipants.setObjectName("labelParticipants")
-        self.gridLayout_3.addWidget(self.labelParticipants, 3, 0, 1, 1)
-        self.horizontalLayout_8 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_8.setObjectName("horizontalLayout_8")
-        self.warName = QtWidgets.QLabel(parent=self.pageWar)
-        font = QtGui.QFont()
-        font.setPointSize(12)
-        self.warName.setFont(font)
-        self.warName.setObjectName("warName")
-        self.horizontalLayout_8.addWidget(self.warName)
-        self.warYear = QtWidgets.QLabel(parent=self.pageWar)
-        font = QtGui.QFont()
-        font.setPointSize(12)
-        self.warYear.setFont(font)
-        self.warYear.setObjectName("warYear")
-        self.horizontalLayout_8.addWidget(self.warYear)
-        self.gridLayout_3.addLayout(self.horizontalLayout_8, 0, 0, 1, 4)
-        self.horizontalLayout_9 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_9.setObjectName("horizontalLayout_9")
-        self.objectivesTable = QtWidgets.QTableWidget(parent=self.pageWar)
-        self.objectivesTable.setObjectName("objectivesTable")
-        self.objectivesTable.setColumnCount(2)
-        self.objectivesTable.setRowCount(0)
-        item = QtWidgets.QTableWidgetItem()
-        self.objectivesTable.setHorizontalHeaderItem(0, item)
-        item = QtWidgets.QTableWidgetItem()
-        self.objectivesTable.setHorizontalHeaderItem(1, item)
-        self.horizontalLayout_9.addWidget(self.objectivesTable)
-        self.addObjectiveBtn = QtWidgets.QPushButton(parent=self.pageWar)
-        self.addObjectiveBtn.setEnabled(True)
-        font = QtGui.QFont()
-        font.setPointSize(10)
-        self.addObjectiveBtn.setFont(font)
-        self.addObjectiveBtn.setObjectName("addObjectiveBtn")
-        self.horizontalLayout_9.addWidget(self.addObjectiveBtn)
-        self.verticalLayout_2 = QtWidgets.QVBoxLayout()
-        self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.label = QtWidgets.QLabel(parent=self.pageWar)
-        self.label.setObjectName("label")
-        self.verticalLayout_2.addWidget(self.label)
-        self.horizontalLayout_5 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_5.setObjectName("horizontalLayout_5")
-        self.majorValue = QtWidgets.QSpinBox(parent=self.pageWar)
-        self.majorValue.setMinimum(1)
-        self.majorValue.setObjectName("majorValue")
-        self.horizontalLayout_5.addWidget(self.majorValue)
-        self.label_5 = QtWidgets.QLabel(parent=self.pageWar)
-        self.label_5.setObjectName("label_5")
-        self.horizontalLayout_5.addWidget(self.label_5)
-        self.verticalLayout_2.addLayout(self.horizontalLayout_5)
-        self.label_2 = QtWidgets.QLabel(parent=self.pageWar)
-        self.label_2.setObjectName("label_2")
-        self.verticalLayout_2.addWidget(self.label_2)
-        self.horizontalLayout_4 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_4.setObjectName("horizontalLayout_4")
-        self.minorValue = QtWidgets.QSpinBox(parent=self.pageWar)
-        self.minorValue.setMinimum(1)
-        self.minorValue.setObjectName("minorValue")
-        self.horizontalLayout_4.addWidget(self.minorValue)
-        self.label_4 = QtWidgets.QLabel(parent=self.pageWar)
-        self.label_4.setObjectName("label_4")
-        self.horizontalLayout_4.addWidget(self.label_4)
-        self.verticalLayout_2.addLayout(self.horizontalLayout_4)
-        self.label_3 = QtWidgets.QLabel(parent=self.pageWar)
-        self.label_3.setObjectName("label_3")
-        self.verticalLayout_2.addWidget(self.label_3)
-        self.influenceToken = QtWidgets.QCheckBox(parent=self.pageWar)
-        self.influenceToken.setEnabled(False)
-        self.influenceToken.setCheckable(True)
-        self.influenceToken.setChecked(True)
-        self.influenceToken.setObjectName("influenceToken")
-        self.verticalLayout_2.addWidget(self.influenceToken)
-        self.horizontalLayout_9.addLayout(self.verticalLayout_2)
-        self.gridLayout_3.addLayout(self.horizontalLayout_9, 2, 0, 1, 4)
+        self.horizontalLayout_6.addWidget(self.endWarBtn)
+        self.verticalLayout_10.addLayout(self.horizontalLayout_6)
         self.selectedDetailsStack.addWidget(self.pageWar)
         self.pageCampaign = QtWidgets.QWidget()
         self.pageCampaign.setObjectName("pageCampaign")
-        self.gridLayout_4 = QtWidgets.QGridLayout(self.pageCampaign)
-        self.gridLayout_4.setObjectName("gridLayout_4")
-        self.labelSectors = QtWidgets.QLabel(parent=self.pageCampaign)
-        self.labelSectors.setObjectName("labelSectors")
-        self.gridLayout_4.addWidget(self.labelSectors, 1, 0, 1, 1)
-        self.labelParticipants_2 = QtWidgets.QLabel(parent=self.pageCampaign)
-        self.labelParticipants_2.setObjectName("labelParticipants_2")
-        self.gridLayout_4.addWidget(self.labelParticipants_2, 3, 0, 1, 1)
-        self.endCampaignBtn = QtWidgets.QPushButton(parent=self.pageCampaign)
-        self.endCampaignBtn.setEnabled(True)
-        self.endCampaignBtn.setObjectName("endCampaignBtn")
-        self.gridLayout_4.addWidget(self.endCampaignBtn, 5, 1, 1, 1)
-        spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
-        self.gridLayout_4.addItem(spacerItem4, 5, 2, 1, 1)
-        self.horizontalLayout_12 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_12.setObjectName("horizontalLayout_12")
-        self.campaignParticipantsTable = QtWidgets.QTableWidget(parent=self.pageCampaign)
-        self.campaignParticipantsTable.setObjectName("campaignParticipantsTable")
-        self.campaignParticipantsTable.setColumnCount(5)
-        self.campaignParticipantsTable.setRowCount(0)
-        item = QtWidgets.QTableWidgetItem()
-        self.campaignParticipantsTable.setHorizontalHeaderItem(0, item)
-        item = QtWidgets.QTableWidgetItem()
-        self.campaignParticipantsTable.setHorizontalHeaderItem(1, item)
-        item = QtWidgets.QTableWidgetItem()
-        self.campaignParticipantsTable.setHorizontalHeaderItem(2, item)
-        item = QtWidgets.QTableWidgetItem()
-        self.campaignParticipantsTable.setHorizontalHeaderItem(3, item)
-        item = QtWidgets.QTableWidgetItem()
-        self.campaignParticipantsTable.setHorizontalHeaderItem(4, item)
-        self.horizontalLayout_12.addWidget(self.campaignParticipantsTable)
-        self.addCampaignParticipantBtn = QtWidgets.QPushButton(parent=self.pageCampaign)
-        self.addCampaignParticipantBtn.setObjectName("addCampaignParticipantBtn")
-        self.horizontalLayout_12.addWidget(self.addCampaignParticipantBtn)
-        self.gridLayout_4.addLayout(self.horizontalLayout_12, 4, 0, 1, 3)
-        self.horizontalLayout_13 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_13.setObjectName("horizontalLayout_13")
-        self.sectorsTable = QtWidgets.QTableWidget(parent=self.pageCampaign)
+        self.verticalLayout_7 = QtWidgets.QVBoxLayout(self.pageCampaign)
+        self.verticalLayout_7.setObjectName("verticalLayout_7")
+        self.horizontalLayout_11 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_11.setObjectName("horizontalLayout_11")
+        self.campaignName = QtWidgets.QLabel(parent=self.pageCampaign)
+        font = QtGui.QFont()
+        font.setPointSize(12)
+        self.campaignName.setFont(font)
+        self.campaignName.setObjectName("campaignName")
+        self.horizontalLayout_11.addWidget(self.campaignName)
+        spacerItem11 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_11.addItem(spacerItem11)
+        self.campaignMonth = QtWidgets.QLabel(parent=self.pageCampaign)
+        font = QtGui.QFont()
+        font.setPointSize(12)
+        self.campaignMonth.setFont(font)
+        self.campaignMonth.setObjectName("campaignMonth")
+        self.horizontalLayout_11.addWidget(self.campaignMonth)
+        self.verticalLayout_7.addLayout(self.horizontalLayout_11)
+        self.groupBox_3 = QtWidgets.QGroupBox(parent=self.pageCampaign)
+        self.groupBox_3.setObjectName("groupBox_3")
+        self.verticalLayout_5 = QtWidgets.QVBoxLayout(self.groupBox_3)
+        self.verticalLayout_5.setObjectName("verticalLayout_5")
+        self.horizontalLayout_17 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_17.setObjectName("horizontalLayout_17")
+        self.addSectorBtn = QtWidgets.QPushButton(parent=self.groupBox_3)
+        self.addSectorBtn.setEnabled(True)
+        self.addSectorBtn.setObjectName("addSectorBtn")
+        self.horizontalLayout_17.addWidget(self.addSectorBtn)
+        spacerItem12 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_17.addItem(spacerItem12)
+        self.verticalLayout_5.addLayout(self.horizontalLayout_17)
+        self.sectorsTable = QtWidgets.QTableWidget(parent=self.groupBox_3)
+        self.sectorsTable.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
+        self.sectorsTable.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
         self.sectorsTable.setObjectName("sectorsTable")
         self.sectorsTable.setColumnCount(6)
         self.sectorsTable.setRowCount(0)
@@ -256,65 +277,71 @@ class Ui_MainWindow(object):
         self.sectorsTable.setHorizontalHeaderItem(4, item)
         item = QtWidgets.QTableWidgetItem()
         self.sectorsTable.setHorizontalHeaderItem(5, item)
-        self.horizontalLayout_13.addWidget(self.sectorsTable)
-        self.addSectorBtn = QtWidgets.QPushButton(parent=self.pageCampaign)
-        self.addSectorBtn.setEnabled(True)
-        self.addSectorBtn.setObjectName("addSectorBtn")
-        self.horizontalLayout_13.addWidget(self.addSectorBtn)
-        self.gridLayout_4.addLayout(self.horizontalLayout_13, 2, 0, 1, 3)
-        self.horizontalLayout_11 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_11.setObjectName("horizontalLayout_11")
-        self.campaignName = QtWidgets.QLabel(parent=self.pageCampaign)
-        font = QtGui.QFont()
-        font.setPointSize(12)
-        self.campaignName.setFont(font)
-        self.campaignName.setObjectName("campaignName")
-        self.horizontalLayout_11.addWidget(self.campaignName)
-        self.campaignMonth = QtWidgets.QLabel(parent=self.pageCampaign)
-        font = QtGui.QFont()
-        font.setPointSize(12)
-        self.campaignMonth.setFont(font)
-        self.campaignMonth.setObjectName("campaignMonth")
-        self.horizontalLayout_11.addWidget(self.campaignMonth)
-        self.gridLayout_4.addLayout(self.horizontalLayout_11, 0, 0, 1, 3)
+        self.sectorsTable.horizontalHeader().setStretchLastSection(True)
+        self.verticalLayout_5.addWidget(self.sectorsTable)
+        self.verticalLayout_7.addWidget(self.groupBox_3)
+        self.groupBox_4 = QtWidgets.QGroupBox(parent=self.pageCampaign)
+        self.groupBox_4.setObjectName("groupBox_4")
+        self.verticalLayout_6 = QtWidgets.QVBoxLayout(self.groupBox_4)
+        self.verticalLayout_6.setObjectName("verticalLayout_6")
+        self.horizontalLayout_18 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_18.setObjectName("horizontalLayout_18")
+        self.addCampaignParticipantBtn = QtWidgets.QPushButton(parent=self.groupBox_4)
+        self.addCampaignParticipantBtn.setObjectName("addCampaignParticipantBtn")
+        self.horizontalLayout_18.addWidget(self.addCampaignParticipantBtn)
+        spacerItem13 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_18.addItem(spacerItem13)
+        self.verticalLayout_6.addLayout(self.horizontalLayout_18)
+        self.campaignParticipantsTable = QtWidgets.QTableWidget(parent=self.groupBox_4)
+        self.campaignParticipantsTable.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
+        self.campaignParticipantsTable.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
+        self.campaignParticipantsTable.setObjectName("campaignParticipantsTable")
+        self.campaignParticipantsTable.setColumnCount(5)
+        self.campaignParticipantsTable.setRowCount(0)
+        item = QtWidgets.QTableWidgetItem()
+        self.campaignParticipantsTable.setHorizontalHeaderItem(0, item)
+        item = QtWidgets.QTableWidgetItem()
+        self.campaignParticipantsTable.setHorizontalHeaderItem(1, item)
+        item = QtWidgets.QTableWidgetItem()
+        self.campaignParticipantsTable.setHorizontalHeaderItem(2, item)
+        item = QtWidgets.QTableWidgetItem()
+        self.campaignParticipantsTable.setHorizontalHeaderItem(3, item)
+        item = QtWidgets.QTableWidgetItem()
+        self.campaignParticipantsTable.setHorizontalHeaderItem(4, item)
+        self.campaignParticipantsTable.horizontalHeader().setStretchLastSection(True)
+        self.verticalLayout_6.addWidget(self.campaignParticipantsTable)
+        self.verticalLayout_7.addWidget(self.groupBox_4)
+        self.horizontalLayout_10 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_10.setObjectName("horizontalLayout_10")
+        spacerItem14 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_10.addItem(spacerItem14)
+        self.endCampaignBtn = QtWidgets.QPushButton(parent=self.pageCampaign)
+        self.endCampaignBtn.setEnabled(True)
+        self.endCampaignBtn.setObjectName("endCampaignBtn")
+        self.horizontalLayout_10.addWidget(self.endCampaignBtn)
+        self.verticalLayout_7.addLayout(self.horizontalLayout_10)
         self.selectedDetailsStack.addWidget(self.pageCampaign)
         self.pageRound = QtWidgets.QWidget()
         self.pageRound.setObjectName("pageRound")
-        self.gridLayout_5 = QtWidgets.QGridLayout(self.pageRound)
-        self.gridLayout_5.setObjectName("gridLayout_5")
-        self.labelChoices = QtWidgets.QLabel(parent=self.pageRound)
-        self.labelChoices.setObjectName("labelChoices")
-        self.gridLayout_5.addWidget(self.labelChoices, 1, 0, 1, 1)
-        self.labelBattles = QtWidgets.QLabel(parent=self.pageRound)
-        self.labelBattles.setObjectName("labelBattles")
-        self.gridLayout_5.addWidget(self.labelBattles, 3, 0, 1, 1)
-        self.endRoundBtn = QtWidgets.QPushButton(parent=self.pageRound)
-        self.endRoundBtn.setEnabled(True)
-        self.endRoundBtn.setObjectName("endRoundBtn")
-        self.gridLayout_5.addWidget(self.endRoundBtn, 5, 1, 1, 1)
-        spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
-        self.gridLayout_5.addItem(spacerItem5, 5, 2, 1, 1)
-        self.horizontalLayout_15 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_15.setObjectName("horizontalLayout_15")
-        self.battlesTable = QtWidgets.QTableWidget(parent=self.pageRound)
-        self.battlesTable.setObjectName("battlesTable")
-        self.battlesTable.setColumnCount(3)
-        self.battlesTable.setRowCount(0)
-        item = QtWidgets.QTableWidgetItem()
-        self.battlesTable.setHorizontalHeaderItem(0, item)
-        item = QtWidgets.QTableWidgetItem()
-        self.battlesTable.setHorizontalHeaderItem(1, item)
-        item = QtWidgets.QTableWidgetItem()
-        self.battlesTable.setHorizontalHeaderItem(2, item)
-        self.horizontalLayout_15.addWidget(self.battlesTable)
-        self.countResultBtn = QtWidgets.QPushButton(parent=self.pageRound)
-        self.countResultBtn.setEnabled(False)
-        self.countResultBtn.setObjectName("countResultBtn")
-        self.horizontalLayout_15.addWidget(self.countResultBtn)
-        self.gridLayout_5.addLayout(self.horizontalLayout_15, 4, 0, 1, 3)
-        self.horizontalLayout_16 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_16.setObjectName("horizontalLayout_16")
-        self.choicesTable = QtWidgets.QTableWidget(parent=self.pageRound)
+        self.verticalLayout_8 = QtWidgets.QVBoxLayout(self.pageRound)
+        self.verticalLayout_8.setObjectName("verticalLayout_8")
+        self.horizontalLayout_14 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_14.setObjectName("horizontalLayout_14")
+        self.roundNb = QtWidgets.QLabel(parent=self.pageRound)
+        font = QtGui.QFont()
+        font.setPointSize(12)
+        self.roundNb.setFont(font)
+        self.roundNb.setObjectName("roundNb")
+        self.horizontalLayout_14.addWidget(self.roundNb)
+        self.verticalLayout_8.addLayout(self.horizontalLayout_14)
+        self.groupBox_5 = QtWidgets.QGroupBox(parent=self.pageRound)
+        self.groupBox_5.setObjectName("groupBox_5")
+        self.horizontalLayout_4 = QtWidgets.QHBoxLayout(self.groupBox_5)
+        self.horizontalLayout_4.setObjectName("horizontalLayout_4")
+        self.choicesTable = QtWidgets.QTableWidget(parent=self.groupBox_5)
+        self.choicesTable.setEnabled(True)
+        self.choicesTable.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
+        self.choicesTable.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
         self.choicesTable.setObjectName("choicesTable")
         self.choicesTable.setColumnCount(3)
         self.choicesTable.setRowCount(0)
@@ -324,30 +351,55 @@ class Ui_MainWindow(object):
         self.choicesTable.setHorizontalHeaderItem(1, item)
         item = QtWidgets.QTableWidgetItem()
         self.choicesTable.setHorizontalHeaderItem(2, item)
-        self.horizontalLayout_16.addWidget(self.choicesTable)
+        self.choicesTable.horizontalHeader().setStretchLastSection(True)
+        self.horizontalLayout_4.addWidget(self.choicesTable)
+        self.verticalLayout_8.addWidget(self.groupBox_5)
+        self.horizontalLayout_13 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_13.setObjectName("horizontalLayout_13")
+        spacerItem15 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_13.addItem(spacerItem15)
         self.resolvePairingBtn = QtWidgets.QPushButton(parent=self.pageRound)
         self.resolvePairingBtn.setEnabled(True)
         self.resolvePairingBtn.setObjectName("resolvePairingBtn")
-        self.horizontalLayout_16.addWidget(self.resolvePairingBtn)
-        self.gridLayout_5.addLayout(self.horizontalLayout_16, 2, 0, 1, 3)
-        self.horizontalLayout_14 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_14.setObjectName("horizontalLayout_14")
-        self.roundNb = QtWidgets.QLabel(parent=self.pageRound)
-        font = QtGui.QFont()
-        font.setPointSize(12)
-        self.roundNb.setFont(font)
-        self.roundNb.setObjectName("roundNb")
-        self.horizontalLayout_14.addWidget(self.roundNb)
-        self.gridLayout_5.addLayout(self.horizontalLayout_14, 0, 0, 1, 3)
+        self.horizontalLayout_13.addWidget(self.resolvePairingBtn)
+        self.verticalLayout_8.addLayout(self.horizontalLayout_13)
+        self.groupBox_6 = QtWidgets.QGroupBox(parent=self.pageRound)
+        self.groupBox_6.setObjectName("groupBox_6")
+        self.horizontalLayout_12 = QtWidgets.QHBoxLayout(self.groupBox_6)
+        self.horizontalLayout_12.setObjectName("horizontalLayout_12")
+        self.battlesTable = QtWidgets.QTableWidget(parent=self.groupBox_6)
+        self.battlesTable.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
+        self.battlesTable.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
+        self.battlesTable.setObjectName("battlesTable")
+        self.battlesTable.setColumnCount(3)
+        self.battlesTable.setRowCount(0)
+        item = QtWidgets.QTableWidgetItem()
+        self.battlesTable.setHorizontalHeaderItem(0, item)
+        item = QtWidgets.QTableWidgetItem()
+        self.battlesTable.setHorizontalHeaderItem(1, item)
+        item = QtWidgets.QTableWidgetItem()
+        self.battlesTable.setHorizontalHeaderItem(2, item)
+        self.battlesTable.horizontalHeader().setStretchLastSection(True)
+        self.horizontalLayout_12.addWidget(self.battlesTable)
+        self.verticalLayout_8.addWidget(self.groupBox_6)
+        self.horizontalLayout_9 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_9.setObjectName("horizontalLayout_9")
+        spacerItem16 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_9.addItem(spacerItem16)
+        self.endRoundBtn = QtWidgets.QPushButton(parent=self.pageRound)
+        self.endRoundBtn.setEnabled(True)
+        self.endRoundBtn.setObjectName("endRoundBtn")
+        self.horizontalLayout_9.addWidget(self.endRoundBtn)
+        self.verticalLayout_8.addLayout(self.horizontalLayout_9)
         self.selectedDetailsStack.addWidget(self.pageRound)
         self.verticalLayout_3.addWidget(self.splitter)
         icon2 = QtGui.QIcon()
         icon2.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/swords-small.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off)
         self.tabWidget.addTab(self.warsTab, icon2, "")
-        self.verticalLayout.addWidget(self.tabWidget)
+        self.verticalLayout_9.addWidget(self.tabWidget)
         MainWindow.setCentralWidget(self.centralwidget)
         self.menubar = QtWidgets.QMenuBar(parent=MainWindow)
-        self.menubar.setGeometry(QtCore.QRect(0, 0, 1288, 22))
+        self.menubar.setGeometry(QtCore.QRect(0, 0, 1235, 21))
         self.menubar.setObjectName("menubar")
         self.menuFile = QtWidgets.QMenu(parent=self.menubar)
         self.menuFile.setObjectName("menuFile")
@@ -422,13 +474,14 @@ class Ui_MainWindow(object):
 
         self.retranslateUi(MainWindow)
         self.tabWidget.setCurrentIndex(1)
-        self.selectedDetailsStack.setCurrentIndex(1)
+        self.selectedDetailsStack.setCurrentIndex(3)
         QtCore.QMetaObject.connectSlotsByName(MainWindow)
 
     def retranslateUi(self, MainWindow):
         _translate = QtCore.QCoreApplication.translate
         MainWindow.setWindowTitle(_translate("MainWindow", "WarChron"))
         self.addPlayerBtn.setText(_translate("MainWindow", "Add player"))
+        self.playersTable.setSortingEnabled(True)
         item = self.playersTable.horizontalHeaderItem(0)
         item.setText(_translate("MainWindow", "Name"))
         item = self.playersTable.horizontalHeaderItem(1)
@@ -442,6 +495,24 @@ class Ui_MainWindow(object):
         self.addCampaignBtn.setText(_translate("MainWindow", "Add Campaign"))
         self.addRoundBtn.setText(_translate("MainWindow", "Add Round"))
         self.labelSelect.setText(_translate("MainWindow", "Select an element within the tree to show/edit details."))
+        self.warName.setText(_translate("MainWindow", "warName"))
+        self.warYear.setText(_translate("MainWindow", "warYear"))
+        self.groupBox.setTitle(_translate("MainWindow", "Objectives"))
+        self.addObjectiveBtn.setText(_translate("MainWindow", "Add objective"))
+        self.label.setText(_translate("MainWindow", "Major objective"))
+        self.label_5.setText(_translate("MainWindow", "points"))
+        self.label_2.setText(_translate("MainWindow", "Minor opportunity"))
+        self.label_4.setText(_translate("MainWindow", "points"))
+        self.label_3.setText(_translate("MainWindow", "Influence"))
+        self.influenceToken.setText(_translate("MainWindow", "Token"))
+        self.objectivesTable.setSortingEnabled(True)
+        item = self.objectivesTable.horizontalHeaderItem(0)
+        item.setText(_translate("MainWindow", "Name"))
+        item = self.objectivesTable.horizontalHeaderItem(1)
+        item.setText(_translate("MainWindow", "Description"))
+        self.groupBox_2.setTitle(_translate("MainWindow", "Participants"))
+        self.addWarParticipantBtn.setText(_translate("MainWindow", "Add participant"))
+        self.warParticipantsTable.setSortingEnabled(True)
         item = self.warParticipantsTable.horizontalHeaderItem(0)
         item.setText(_translate("MainWindow", "Name"))
         item = self.warParticipantsTable.horizontalHeaderItem(1)
@@ -452,37 +523,12 @@ class Ui_MainWindow(object):
         item.setText(_translate("MainWindow", "Victory pts."))
         item = self.warParticipantsTable.horizontalHeaderItem(4)
         item.setText(_translate("MainWindow", "Theme pts"))
-        self.addWarParticipantBtn.setText(_translate("MainWindow", "Add participant"))
-        self.labelObjectives.setText(_translate("MainWindow", "Objectives"))
         self.endWarBtn.setText(_translate("MainWindow", "End war"))
-        self.labelParticipants.setText(_translate("MainWindow", "Participants"))
-        self.warName.setText(_translate("MainWindow", "warName"))
-        self.warYear.setText(_translate("MainWindow", "warYear"))
-        item = self.objectivesTable.horizontalHeaderItem(0)
-        item.setText(_translate("MainWindow", "Name"))
-        item = self.objectivesTable.horizontalHeaderItem(1)
-        item.setText(_translate("MainWindow", "Description"))
-        self.addObjectiveBtn.setText(_translate("MainWindow", "Add objective"))
-        self.label.setText(_translate("MainWindow", "Major objective"))
-        self.label_5.setText(_translate("MainWindow", "points"))
-        self.label_2.setText(_translate("MainWindow", "Minor opportunity"))
-        self.label_4.setText(_translate("MainWindow", "points"))
-        self.label_3.setText(_translate("MainWindow", "Influence"))
-        self.influenceToken.setText(_translate("MainWindow", "Token"))
-        self.labelSectors.setText(_translate("MainWindow", "Sectors"))
-        self.labelParticipants_2.setText(_translate("MainWindow", "Participants"))
-        self.endCampaignBtn.setText(_translate("MainWindow", "End campaign"))
-        item = self.campaignParticipantsTable.horizontalHeaderItem(0)
-        item.setText(_translate("MainWindow", "Name"))
-        item = self.campaignParticipantsTable.horizontalHeaderItem(1)
-        item.setText(_translate("MainWindow", "Leader"))
-        item = self.campaignParticipantsTable.horizontalHeaderItem(2)
-        item.setText(_translate("MainWindow", "Theme"))
-        item = self.campaignParticipantsTable.horizontalHeaderItem(3)
-        item.setText(_translate("MainWindow", "Victory pts."))
-        item = self.campaignParticipantsTable.horizontalHeaderItem(4)
-        item.setText(_translate("MainWindow", "Theme pts."))
-        self.addCampaignParticipantBtn.setText(_translate("MainWindow", "Add participant"))
+        self.campaignName.setText(_translate("MainWindow", "campaignName"))
+        self.campaignMonth.setText(_translate("MainWindow", "campaignMonth"))
+        self.groupBox_3.setTitle(_translate("MainWindow", "Sectors"))
+        self.addSectorBtn.setText(_translate("MainWindow", "Add Sector"))
+        self.sectorsTable.setSortingEnabled(True)
         item = self.sectorsTable.horizontalHeaderItem(0)
         item.setText(_translate("MainWindow", "Name"))
         item = self.sectorsTable.horizontalHeaderItem(1)
@@ -495,19 +541,23 @@ class Ui_MainWindow(object):
         item.setText(_translate("MainWindow", "Influence imp."))
         item = self.sectorsTable.horizontalHeaderItem(5)
         item.setText(_translate("MainWindow", "Description"))
-        self.addSectorBtn.setText(_translate("MainWindow", "Add Sector"))
-        self.campaignName.setText(_translate("MainWindow", "campaignName"))
-        self.campaignMonth.setText(_translate("MainWindow", "campaignMonth"))
-        self.labelChoices.setText(_translate("MainWindow", "Choices"))
-        self.labelBattles.setText(_translate("MainWindow", "Battles"))
-        self.endRoundBtn.setText(_translate("MainWindow", "End round"))
-        item = self.battlesTable.horizontalHeaderItem(0)
-        item.setText(_translate("MainWindow", "Sector"))
-        item = self.battlesTable.horizontalHeaderItem(1)
-        item.setText(_translate("MainWindow", "Player 1"))
-        item = self.battlesTable.horizontalHeaderItem(2)
-        item.setText(_translate("MainWindow", "Player 2"))
-        self.countResultBtn.setText(_translate("MainWindow", "Count results"))
+        self.groupBox_4.setTitle(_translate("MainWindow", "Participants"))
+        self.addCampaignParticipantBtn.setText(_translate("MainWindow", "Add participant"))
+        self.campaignParticipantsTable.setSortingEnabled(True)
+        item = self.campaignParticipantsTable.horizontalHeaderItem(0)
+        item.setText(_translate("MainWindow", "Name"))
+        item = self.campaignParticipantsTable.horizontalHeaderItem(1)
+        item.setText(_translate("MainWindow", "Leader"))
+        item = self.campaignParticipantsTable.horizontalHeaderItem(2)
+        item.setText(_translate("MainWindow", "Theme"))
+        item = self.campaignParticipantsTable.horizontalHeaderItem(3)
+        item.setText(_translate("MainWindow", "Victory pts."))
+        item = self.campaignParticipantsTable.horizontalHeaderItem(4)
+        item.setText(_translate("MainWindow", "Theme pts."))
+        self.endCampaignBtn.setText(_translate("MainWindow", "End campaign"))
+        self.roundNb.setText(_translate("MainWindow", "Round Nb"))
+        self.groupBox_5.setTitle(_translate("MainWindow", "Choices"))
+        self.choicesTable.setSortingEnabled(True)
         item = self.choicesTable.horizontalHeaderItem(0)
         item.setText(_translate("MainWindow", "Player"))
         item = self.choicesTable.horizontalHeaderItem(1)
@@ -515,7 +565,15 @@ class Ui_MainWindow(object):
         item = self.choicesTable.horizontalHeaderItem(2)
         item.setText(_translate("MainWindow", "Secondary"))
         self.resolvePairingBtn.setText(_translate("MainWindow", "Resolve pairing"))
-        self.roundNb.setText(_translate("MainWindow", "Round Nb"))
+        self.groupBox_6.setTitle(_translate("MainWindow", "Battles"))
+        self.battlesTable.setSortingEnabled(True)
+        item = self.battlesTable.horizontalHeaderItem(0)
+        item.setText(_translate("MainWindow", "Sector"))
+        item = self.battlesTable.horizontalHeaderItem(1)
+        item.setText(_translate("MainWindow", "Player 1"))
+        item = self.battlesTable.horizontalHeaderItem(2)
+        item.setText(_translate("MainWindow", "Player 2"))
+        self.endRoundBtn.setText(_translate("MainWindow", "End round"))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.warsTab), _translate("MainWindow", "Wars"))
         self.menuFile.setTitle(_translate("MainWindow", "File"))
         self.menuEdit.setTitle(_translate("MainWindow", "Edit"))
diff --git a/src/warchron/view/ui/ui_main_window.ui b/src/warchron/view/ui/ui_main_window.ui
index 5ea7bb6..a740546 100644
--- a/src/warchron/view/ui/ui_main_window.ui
+++ b/src/warchron/view/ui/ui_main_window.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1288</width>
-    <height>817</height>
+    <width>1235</width>
+    <height>954</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -18,7 +18,7 @@
     <normaloff>../resources/warchron_logo.png</normaloff>../resources/warchron_logo.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget">
-   <layout class="QVBoxLayout" name="verticalLayout">
+   <layout class="QVBoxLayout" name="verticalLayout_9">
     <item>
      <widget class="QTabWidget" name="tabWidget">
       <property name="currentIndex">
@@ -40,6 +40,10 @@
             <property name="text">
              <string>Add player</string>
             </property>
+            <property name="icon">
+             <iconset>
+              <normaloff>../resources/plus.png</normaloff>../resources/plus.png</iconset>
+            </property>
            </widget>
           </item>
           <item>
@@ -59,6 +63,21 @@
         </item>
         <item row="1" column="0">
          <widget class="QTableWidget" name="playersTable">
+          <property name="enabled">
+           <bool>true</bool>
+          </property>
+          <property name="editTriggers">
+           <set>QAbstractItemView::NoEditTriggers</set>
+          </property>
+          <property name="selectionBehavior">
+           <enum>QAbstractItemView::SelectRows</enum>
+          </property>
+          <property name="sortingEnabled">
+           <bool>true</bool>
+          </property>
+          <attribute name="horizontalHeaderStretchLastSection">
+           <bool>true</bool>
+          </attribute>
           <column>
            <property name="text">
             <string>Name</string>
@@ -99,6 +118,10 @@
             <property name="text">
              <string>Add war</string>
             </property>
+            <property name="icon">
+             <iconset>
+              <normaloff>../resources/plus.png</normaloff>../resources/plus.png</iconset>
+            </property>
            </widget>
           </item>
           <item>
@@ -109,6 +132,10 @@
             <property name="text">
              <string>Add Campaign</string>
             </property>
+            <property name="icon">
+             <iconset>
+              <normaloff>../resources/plus.png</normaloff>../resources/plus.png</iconset>
+            </property>
            </widget>
           </item>
           <item>
@@ -119,6 +146,10 @@
             <property name="text">
              <string>Add Round</string>
             </property>
+            <property name="icon">
+             <iconset>
+              <normaloff>../resources/plus.png</normaloff>../resources/plus.png</iconset>
+            </property>
            </widget>
           </item>
           <item>
@@ -197,72 +228,8 @@
             </layout>
            </widget>
            <widget class="QWidget" name="pageWar">
-            <layout class="QGridLayout" name="gridLayout_3">
-             <item row="4" column="0" colspan="4">
-              <layout class="QHBoxLayout" name="horizontalLayout_10">
-               <item>
-                <widget class="QTableWidget" name="warParticipantsTable">
-                 <column>
-                  <property name="text">
-                   <string>Name</string>
-                  </property>
-                 </column>
-                 <column>
-                  <property name="text">
-                   <string>Faction</string>
-                  </property>
-                 </column>
-                 <column>
-                  <property name="text">
-                   <string>Campaigns</string>
-                  </property>
-                 </column>
-                 <column>
-                  <property name="text">
-                   <string>Victory pts.</string>
-                  </property>
-                 </column>
-                 <column>
-                  <property name="text">
-                   <string>Theme pts</string>
-                  </property>
-                 </column>
-                </widget>
-               </item>
-               <item>
-                <widget class="QPushButton" name="addWarParticipantBtn">
-                 <property name="text">
-                  <string>Add participant</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
-             <item row="1" column="0">
-              <widget class="QLabel" name="labelObjectives">
-               <property name="text">
-                <string>Objectives</string>
-               </property>
-              </widget>
-             </item>
-             <item row="5" column="1">
-              <widget class="QPushButton" name="endWarBtn">
-               <property name="enabled">
-                <bool>true</bool>
-               </property>
-               <property name="text">
-                <string>End war</string>
-               </property>
-              </widget>
-             </item>
-             <item row="3" column="0">
-              <widget class="QLabel" name="labelParticipants">
-               <property name="text">
-                <string>Participants</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="0" colspan="4">
+            <layout class="QVBoxLayout" name="verticalLayout_10">
+             <item>
               <layout class="QHBoxLayout" name="horizontalLayout_8">
                <item>
                 <widget class="QLabel" name="warName">
@@ -276,6 +243,19 @@
                  </property>
                 </widget>
                </item>
+               <item>
+                <spacer name="horizontalSpacer_6">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>630</width>
+                   <height>20</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
                <item>
                 <widget class="QLabel" name="warYear">
                  <property name="font">
@@ -290,246 +270,297 @@
                </item>
               </layout>
              </item>
-             <item row="2" column="0" colspan="4">
-              <layout class="QHBoxLayout" name="horizontalLayout_9">
+             <item>
+              <widget class="QGroupBox" name="groupBox">
+               <property name="title">
+                <string>Objectives</string>
+               </property>
+               <layout class="QVBoxLayout" name="verticalLayout">
+                <item>
+                 <layout class="QHBoxLayout" name="horizontalLayout_3">
+                  <item>
+                   <widget class="QPushButton" name="addObjectiveBtn">
+                    <property name="enabled">
+                     <bool>true</bool>
+                    </property>
+                    <property name="font">
+                     <font>
+                      <pointsize>10</pointsize>
+                     </font>
+                    </property>
+                    <property name="text">
+                     <string>Add objective</string>
+                    </property>
+                    <property name="icon">
+                     <iconset>
+                      <normaloff>../resources/plus.png</normaloff>../resources/plus.png</iconset>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <spacer name="horizontalSpacer_9">
+                    <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">
+                    <property name="text">
+                     <string>Major objective</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QSpinBox" name="majorValue">
+                    <property name="minimum">
+                     <number>1</number>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QLabel" name="label_5">
+                    <property name="text">
+                     <string>points</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <spacer name="horizontalSpacer_10">
+                    <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_2">
+                    <property name="text">
+                     <string>Minor opportunity</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QSpinBox" name="minorValue">
+                    <property name="minimum">
+                     <number>1</number>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QLabel" name="label_4">
+                    <property name="text">
+                     <string>points</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <spacer name="horizontalSpacer_11">
+                    <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_3">
+                    <property name="text">
+                     <string>Influence</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QCheckBox" name="influenceToken">
+                    <property name="enabled">
+                     <bool>true</bool>
+                    </property>
+                    <property name="text">
+                     <string>Token</string>
+                    </property>
+                    <property name="checkable">
+                     <bool>true</bool>
+                    </property>
+                    <property name="checked">
+                     <bool>true</bool>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <spacer name="horizontalSpacer_16">
+                    <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>
+                 <widget class="QTableWidget" name="objectivesTable">
+                  <property name="editTriggers">
+                   <set>QAbstractItemView::NoEditTriggers</set>
+                  </property>
+                  <property name="alternatingRowColors">
+                   <bool>false</bool>
+                  </property>
+                  <property name="selectionBehavior">
+                   <enum>QAbstractItemView::SelectRows</enum>
+                  </property>
+                  <property name="sortingEnabled">
+                   <bool>true</bool>
+                  </property>
+                  <attribute name="horizontalHeaderStretchLastSection">
+                   <bool>true</bool>
+                  </attribute>
+                  <column>
+                   <property name="text">
+                    <string>Name</string>
+                   </property>
+                  </column>
+                  <column>
+                   <property name="text">
+                    <string>Description</string>
+                   </property>
+                  </column>
+                 </widget>
+                </item>
+               </layout>
+              </widget>
+             </item>
+             <item>
+              <widget class="QGroupBox" name="groupBox_2">
+               <property name="title">
+                <string>Participants</string>
+               </property>
+               <layout class="QVBoxLayout" name="verticalLayout_2">
+                <item>
+                 <layout class="QHBoxLayout" name="horizontalLayout_5">
+                  <item>
+                   <widget class="QPushButton" name="addWarParticipantBtn">
+                    <property name="text">
+                     <string>Add participant</string>
+                    </property>
+                    <property name="icon">
+                     <iconset>
+                      <normaloff>../resources/plus.png</normaloff>../resources/plus.png</iconset>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <spacer name="horizontalSpacer_13">
+                    <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>
+                 <widget class="QTableWidget" name="warParticipantsTable">
+                  <property name="editTriggers">
+                   <set>QAbstractItemView::NoEditTriggers</set>
+                  </property>
+                  <property name="alternatingRowColors">
+                   <bool>false</bool>
+                  </property>
+                  <property name="selectionBehavior">
+                   <enum>QAbstractItemView::SelectRows</enum>
+                  </property>
+                  <property name="sortingEnabled">
+                   <bool>true</bool>
+                  </property>
+                  <attribute name="horizontalHeaderStretchLastSection">
+                   <bool>true</bool>
+                  </attribute>
+                  <column>
+                   <property name="text">
+                    <string>Name</string>
+                   </property>
+                  </column>
+                  <column>
+                   <property name="text">
+                    <string>Faction</string>
+                   </property>
+                  </column>
+                  <column>
+                   <property name="text">
+                    <string>Campaigns</string>
+                   </property>
+                  </column>
+                  <column>
+                   <property name="text">
+                    <string>Victory pts.</string>
+                   </property>
+                  </column>
+                  <column>
+                   <property name="text">
+                    <string>Theme pts</string>
+                   </property>
+                  </column>
+                 </widget>
+                </item>
+               </layout>
+              </widget>
+             </item>
+             <item>
+              <layout class="QHBoxLayout" name="horizontalLayout_6">
                <item>
-                <widget class="QTableWidget" name="objectivesTable">
-                 <column>
-                  <property name="text">
-                   <string>Name</string>
-                  </property>
-                 </column>
-                 <column>
-                  <property name="text">
-                   <string>Description</string>
-                  </property>
-                 </column>
-                </widget>
+                <spacer name="horizontalSpacer_12">
+                 <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="QPushButton" name="addObjectiveBtn">
+                <widget class="QPushButton" name="endWarBtn">
                  <property name="enabled">
                   <bool>true</bool>
                  </property>
-                 <property name="font">
-                  <font>
-                   <pointsize>10</pointsize>
-                  </font>
-                 </property>
                  <property name="text">
-                  <string>Add objective</string>
+                  <string>End war</string>
                  </property>
                 </widget>
                </item>
-               <item>
-                <layout class="QVBoxLayout" name="verticalLayout_2">
-                 <item>
-                  <widget class="QLabel" name="label">
-                   <property name="text">
-                    <string>Major objective</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <layout class="QHBoxLayout" name="horizontalLayout_5">
-                   <item>
-                    <widget class="QSpinBox" name="majorValue">
-                     <property name="minimum">
-                      <number>1</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <widget class="QLabel" name="label_5">
-                     <property name="text">
-                      <string>points</string>
-                     </property>
-                    </widget>
-                   </item>
-                  </layout>
-                 </item>
-                 <item>
-                  <widget class="QLabel" name="label_2">
-                   <property name="text">
-                    <string>Minor opportunity</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <layout class="QHBoxLayout" name="horizontalLayout_4">
-                   <item>
-                    <widget class="QSpinBox" name="minorValue">
-                     <property name="minimum">
-                      <number>1</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <widget class="QLabel" name="label_4">
-                     <property name="text">
-                      <string>points</string>
-                     </property>
-                    </widget>
-                   </item>
-                  </layout>
-                 </item>
-                 <item>
-                  <widget class="QLabel" name="label_3">
-                   <property name="text">
-                    <string>Influence</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QCheckBox" name="influenceToken">
-                   <property name="enabled">
-                    <bool>false</bool>
-                   </property>
-                   <property name="text">
-                    <string>Token</string>
-                   </property>
-                   <property name="checkable">
-                    <bool>true</bool>
-                   </property>
-                   <property name="checked">
-                    <bool>true</bool>
-                   </property>
-                  </widget>
-                 </item>
-                </layout>
-               </item>
               </layout>
              </item>
             </layout>
            </widget>
            <widget class="QWidget" name="pageCampaign">
-            <layout class="QGridLayout" name="gridLayout_4">
-             <item row="1" column="0">
-              <widget class="QLabel" name="labelSectors">
-               <property name="text">
-                <string>Sectors</string>
-               </property>
-              </widget>
-             </item>
-             <item row="3" column="0">
-              <widget class="QLabel" name="labelParticipants_2">
-               <property name="text">
-                <string>Participants</string>
-               </property>
-              </widget>
-             </item>
-             <item row="5" column="1">
-              <widget class="QPushButton" name="endCampaignBtn">
-               <property name="enabled">
-                <bool>true</bool>
-               </property>
-               <property name="text">
-                <string>End campaign</string>
-               </property>
-              </widget>
-             </item>
-             <item row="5" column="2">
-              <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>
-             <item row="4" column="0" colspan="3">
-              <layout class="QHBoxLayout" name="horizontalLayout_12">
-               <item>
-                <widget class="QTableWidget" name="campaignParticipantsTable">
-                 <column>
-                  <property name="text">
-                   <string>Name</string>
-                  </property>
-                 </column>
-                 <column>
-                  <property name="text">
-                   <string>Leader</string>
-                  </property>
-                 </column>
-                 <column>
-                  <property name="text">
-                   <string>Theme</string>
-                  </property>
-                 </column>
-                 <column>
-                  <property name="text">
-                   <string>Victory pts.</string>
-                  </property>
-                 </column>
-                 <column>
-                  <property name="text">
-                   <string>Theme pts.</string>
-                  </property>
-                 </column>
-                </widget>
-               </item>
-               <item>
-                <widget class="QPushButton" name="addCampaignParticipantBtn">
-                 <property name="text">
-                  <string>Add participant</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
-             <item row="2" column="0" colspan="3">
-              <layout class="QHBoxLayout" name="horizontalLayout_13">
-               <item>
-                <widget class="QTableWidget" name="sectorsTable">
-                 <column>
-                  <property name="text">
-                   <string>Name</string>
-                  </property>
-                 </column>
-                 <column>
-                  <property name="text">
-                   <string>Round</string>
-                  </property>
-                 </column>
-                 <column>
-                  <property name="text">
-                   <string>Major obj.</string>
-                  </property>
-                 </column>
-                 <column>
-                  <property name="text">
-                   <string>Minor opp.</string>
-                  </property>
-                 </column>
-                 <column>
-                  <property name="text">
-                   <string>Influence imp.</string>
-                  </property>
-                 </column>
-                 <column>
-                  <property name="text">
-                   <string>Description</string>
-                  </property>
-                 </column>
-                </widget>
-               </item>
-               <item>
-                <widget class="QPushButton" name="addSectorBtn">
-                 <property name="enabled">
-                  <bool>true</bool>
-                 </property>
-                 <property name="text">
-                  <string>Add Sector</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
-             <item row="0" column="0" colspan="3">
+            <layout class="QVBoxLayout" name="verticalLayout_7">
+             <item>
               <layout class="QHBoxLayout" name="horizontalLayout_11">
                <item>
                 <widget class="QLabel" name="campaignName">
@@ -543,6 +574,19 @@
                  </property>
                 </widget>
                </item>
+               <item>
+                <spacer name="horizontalSpacer_8">
+                 <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="campaignMonth">
                  <property name="font">
@@ -557,101 +601,275 @@
                </item>
               </layout>
              </item>
-            </layout>
-           </widget>
-           <widget class="QWidget" name="pageRound">
-            <layout class="QGridLayout" name="gridLayout_5">
-             <item row="1" column="0">
-              <widget class="QLabel" name="labelChoices">
-               <property name="text">
-                <string>Choices</string>
+             <item>
+              <widget class="QGroupBox" name="groupBox_3">
+               <property name="title">
+                <string>Sectors</string>
                </property>
+               <layout class="QVBoxLayout" name="verticalLayout_5">
+                <item>
+                 <layout class="QHBoxLayout" name="horizontalLayout_17">
+                  <item>
+                   <widget class="QPushButton" name="addSectorBtn">
+                    <property name="enabled">
+                     <bool>true</bool>
+                    </property>
+                    <property name="text">
+                     <string>Add Sector</string>
+                    </property>
+                    <property name="icon">
+                     <iconset>
+                      <normaloff>../resources/plus.png</normaloff>../resources/plus.png</iconset>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <spacer name="horizontalSpacer_14">
+                    <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>
+                 <widget class="QTableWidget" name="sectorsTable">
+                  <property name="editTriggers">
+                   <set>QAbstractItemView::NoEditTriggers</set>
+                  </property>
+                  <property name="selectionBehavior">
+                   <enum>QAbstractItemView::SelectRows</enum>
+                  </property>
+                  <property name="sortingEnabled">
+                   <bool>true</bool>
+                  </property>
+                  <attribute name="horizontalHeaderStretchLastSection">
+                   <bool>true</bool>
+                  </attribute>
+                  <column>
+                   <property name="text">
+                    <string>Name</string>
+                   </property>
+                  </column>
+                  <column>
+                   <property name="text">
+                    <string>Round</string>
+                   </property>
+                  </column>
+                  <column>
+                   <property name="text">
+                    <string>Major obj.</string>
+                   </property>
+                  </column>
+                  <column>
+                   <property name="text">
+                    <string>Minor opp.</string>
+                   </property>
+                  </column>
+                  <column>
+                   <property name="text">
+                    <string>Influence imp.</string>
+                   </property>
+                  </column>
+                  <column>
+                   <property name="text">
+                    <string>Description</string>
+                   </property>
+                  </column>
+                 </widget>
+                </item>
+               </layout>
               </widget>
              </item>
-             <item row="3" column="0">
-              <widget class="QLabel" name="labelBattles">
-               <property name="text">
-                <string>Battles</string>
+             <item>
+              <widget class="QGroupBox" name="groupBox_4">
+               <property name="title">
+                <string>Participants</string>
                </property>
+               <layout class="QVBoxLayout" name="verticalLayout_6">
+                <item>
+                 <layout class="QHBoxLayout" name="horizontalLayout_18">
+                  <item>
+                   <widget class="QPushButton" name="addCampaignParticipantBtn">
+                    <property name="text">
+                     <string>Add participant</string>
+                    </property>
+                    <property name="icon">
+                     <iconset>
+                      <normaloff>../resources/plus.png</normaloff>../resources/plus.png</iconset>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <spacer name="horizontalSpacer_15">
+                    <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>
+                 <widget class="QTableWidget" name="campaignParticipantsTable">
+                  <property name="editTriggers">
+                   <set>QAbstractItemView::NoEditTriggers</set>
+                  </property>
+                  <property name="selectionBehavior">
+                   <enum>QAbstractItemView::SelectRows</enum>
+                  </property>
+                  <property name="sortingEnabled">
+                   <bool>true</bool>
+                  </property>
+                  <attribute name="horizontalHeaderStretchLastSection">
+                   <bool>true</bool>
+                  </attribute>
+                  <column>
+                   <property name="text">
+                    <string>Name</string>
+                   </property>
+                  </column>
+                  <column>
+                   <property name="text">
+                    <string>Leader</string>
+                   </property>
+                  </column>
+                  <column>
+                   <property name="text">
+                    <string>Theme</string>
+                   </property>
+                  </column>
+                  <column>
+                   <property name="text">
+                    <string>Victory pts.</string>
+                   </property>
+                  </column>
+                  <column>
+                   <property name="text">
+                    <string>Theme pts.</string>
+                   </property>
+                  </column>
+                 </widget>
+                </item>
+               </layout>
               </widget>
              </item>
-             <item row="5" column="1">
-              <widget class="QPushButton" name="endRoundBtn">
-               <property name="enabled">
-                <bool>true</bool>
-               </property>
-               <property name="text">
-                <string>End round</string>
-               </property>
-              </widget>
-             </item>
-             <item row="5" column="2">
-              <spacer name="horizontalSpacer_7">
-               <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 row="4" column="0" colspan="3">
-              <layout class="QHBoxLayout" name="horizontalLayout_15">
+             <item>
+              <layout class="QHBoxLayout" name="horizontalLayout_10">
                <item>
-                <widget class="QTableWidget" name="battlesTable">
-                 <column>
-                  <property name="text">
-                   <string>Sector</string>
-                  </property>
-                 </column>
-                 <column>
-                  <property name="text">
-                   <string>Player 1</string>
-                  </property>
-                 </column>
-                 <column>
-                  <property name="text">
-                   <string>Player 2</string>
-                  </property>
-                 </column>
-                </widget>
+                <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>
                <item>
-                <widget class="QPushButton" name="countResultBtn">
+                <widget class="QPushButton" name="endCampaignBtn">
                  <property name="enabled">
-                  <bool>false</bool>
+                  <bool>true</bool>
                  </property>
                  <property name="text">
-                  <string>Count results</string>
+                  <string>End campaign</string>
                  </property>
                 </widget>
                </item>
               </layout>
              </item>
-             <item row="2" column="0" colspan="3">
-              <layout class="QHBoxLayout" name="horizontalLayout_16">
+            </layout>
+           </widget>
+           <widget class="QWidget" name="pageRound">
+            <layout class="QVBoxLayout" name="verticalLayout_8">
+             <item>
+              <layout class="QHBoxLayout" name="horizontalLayout_14">
                <item>
-                <widget class="QTableWidget" name="choicesTable">
-                 <column>
-                  <property name="text">
-                   <string>Player</string>
-                  </property>
-                 </column>
-                 <column>
-                  <property name="text">
-                   <string>Priority</string>
-                  </property>
-                 </column>
-                 <column>
-                  <property name="text">
-                   <string>Secondary</string>
-                  </property>
-                 </column>
+                <widget class="QLabel" name="roundNb">
+                 <property name="font">
+                  <font>
+                   <pointsize>12</pointsize>
+                  </font>
+                 </property>
+                 <property name="text">
+                  <string>Round Nb</string>
+                 </property>
                 </widget>
                </item>
+              </layout>
+             </item>
+             <item>
+              <widget class="QGroupBox" name="groupBox_5">
+               <property name="title">
+                <string>Choices</string>
+               </property>
+               <layout class="QHBoxLayout" name="horizontalLayout_4">
+                <item>
+                 <widget class="QTableWidget" name="choicesTable">
+                  <property name="enabled">
+                   <bool>true</bool>
+                  </property>
+                  <property name="editTriggers">
+                   <set>QAbstractItemView::NoEditTriggers</set>
+                  </property>
+                  <property name="selectionBehavior">
+                   <enum>QAbstractItemView::SelectRows</enum>
+                  </property>
+                  <property name="sortingEnabled">
+                   <bool>true</bool>
+                  </property>
+                  <attribute name="horizontalHeaderStretchLastSection">
+                   <bool>true</bool>
+                  </attribute>
+                  <column>
+                   <property name="text">
+                    <string>Player</string>
+                   </property>
+                  </column>
+                  <column>
+                   <property name="text">
+                    <string>Priority</string>
+                   </property>
+                  </column>
+                  <column>
+                   <property name="text">
+                    <string>Secondary</string>
+                   </property>
+                  </column>
+                 </widget>
+                </item>
+               </layout>
+              </widget>
+             </item>
+             <item>
+              <layout class="QHBoxLayout" name="horizontalLayout_13">
+               <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>
                <item>
                 <widget class="QPushButton" name="resolvePairingBtn">
                  <property name="enabled">
@@ -664,17 +882,68 @@
                </item>
               </layout>
              </item>
-             <item row="0" column="0" colspan="3">
-              <layout class="QHBoxLayout" name="horizontalLayout_14">
+             <item>
+              <widget class="QGroupBox" name="groupBox_6">
+               <property name="title">
+                <string>Battles</string>
+               </property>
+               <layout class="QHBoxLayout" name="horizontalLayout_12">
+                <item>
+                 <widget class="QTableWidget" name="battlesTable">
+                  <property name="editTriggers">
+                   <set>QAbstractItemView::NoEditTriggers</set>
+                  </property>
+                  <property name="selectionBehavior">
+                   <enum>QAbstractItemView::SelectRows</enum>
+                  </property>
+                  <property name="sortingEnabled">
+                   <bool>true</bool>
+                  </property>
+                  <attribute name="horizontalHeaderStretchLastSection">
+                   <bool>true</bool>
+                  </attribute>
+                  <column>
+                   <property name="text">
+                    <string>Sector</string>
+                   </property>
+                  </column>
+                  <column>
+                   <property name="text">
+                    <string>Player 1</string>
+                   </property>
+                  </column>
+                  <column>
+                   <property name="text">
+                    <string>Player 2</string>
+                   </property>
+                  </column>
+                 </widget>
+                </item>
+               </layout>
+              </widget>
+             </item>
+             <item>
+              <layout class="QHBoxLayout" name="horizontalLayout_9">
                <item>
-                <widget class="QLabel" name="roundNb">
-                 <property name="font">
-                  <font>
-                   <pointsize>12</pointsize>
-                  </font>
+                <spacer name="horizontalSpacer_7">
+                 <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="QPushButton" name="endRoundBtn">
+                 <property name="enabled">
+                  <bool>true</bool>
                  </property>
                  <property name="text">
-                  <string>Round Nb</string>
+                  <string>End round</string>
                  </property>
                 </widget>
                </item>
@@ -696,8 +965,8 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>1288</width>
-     <height>22</height>
+     <width>1235</width>
+     <height>21</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">