diff --git a/src/warchron/view/ui/ui_main_window.py b/src/warchron/view/ui/ui_main_window.py
index 8da8938..196353d 100644
--- a/src/warchron/view/ui/ui_main_window.py
+++ b/src/warchron/view/ui/ui_main_window.py
@@ -12,19 +12,29 @@ from PyQt6 import QtCore, QtGui, QtWidgets
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
         MainWindow.setObjectName("MainWindow")
-        MainWindow.resize(800, 600)
+        MainWindow.resize(1288, 817)
         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.tabWidget = QtWidgets.QTabWidget(parent=self.centralwidget)
-        self.tabWidget.setGeometry(QtCore.QRect(16, 9, 771, 531))
         self.tabWidget.setObjectName("tabWidget")
         self.playersTab = QtWidgets.QWidget()
         self.playersTab.setObjectName("playersTab")
+        self.gridLayout = QtWidgets.QGridLayout(self.playersTab)
+        self.gridLayout.setObjectName("gridLayout")
+        self.horizontalLayout = QtWidgets.QHBoxLayout()
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.addPlayerBtn = QtWidgets.QPushButton(parent=self.playersTab)
+        self.addPlayerBtn.setObjectName("addPlayerBtn")
+        self.horizontalLayout.addWidget(self.addPlayerBtn)
+        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout.addItem(spacerItem)
+        self.gridLayout.addLayout(self.horizontalLayout, 0, 0, 1, 1)
         self.playersTable = QtWidgets.QTableWidget(parent=self.playersTab)
-        self.playersTable.setGeometry(QtCore.QRect(10, 60, 741, 431))
         self.playersTable.setObjectName("playersTable")
         self.playersTable.setColumnCount(4)
         self.playersTable.setRowCount(0)
@@ -36,59 +46,60 @@ class Ui_MainWindow(object):
         self.playersTable.setHorizontalHeaderItem(2, item)
         item = QtWidgets.QTableWidgetItem()
         self.playersTable.setHorizontalHeaderItem(3, item)
-        self.addPlayerBtn = QtWidgets.QPushButton(parent=self.playersTab)
-        self.addPlayerBtn.setGeometry(QtCore.QRect(20, 20, 75, 23))
-        self.addPlayerBtn.setObjectName("addPlayerBtn")
+        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)
         self.tabWidget.addTab(self.playersTab, icon1, "")
         self.warsTab = QtWidgets.QWidget()
         self.warsTab.setObjectName("warsTab")
-        self.warsTree = QtWidgets.QTreeWidget(parent=self.warsTab)
-        self.warsTree.setGeometry(QtCore.QRect(10, 60, 211, 431))
-        self.warsTree.setObjectName("warsTree")
+        self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.warsTab)
+        self.verticalLayout_3.setObjectName("verticalLayout_3")
+        self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
         self.addWarBtn = QtWidgets.QPushButton(parent=self.warsTab)
-        self.addWarBtn.setGeometry(QtCore.QRect(20, 20, 75, 23))
         self.addWarBtn.setObjectName("addWarBtn")
+        self.horizontalLayout_2.addWidget(self.addWarBtn)
         self.addCampaignBtn = QtWidgets.QPushButton(parent=self.warsTab)
         self.addCampaignBtn.setEnabled(False)
-        self.addCampaignBtn.setGeometry(QtCore.QRect(110, 20, 91, 23))
         self.addCampaignBtn.setObjectName("addCampaignBtn")
+        self.horizontalLayout_2.addWidget(self.addCampaignBtn)
         self.addRoundBtn = QtWidgets.QPushButton(parent=self.warsTab)
         self.addRoundBtn.setEnabled(False)
-        self.addRoundBtn.setGeometry(QtCore.QRect(220, 20, 91, 23))
         self.addRoundBtn.setObjectName("addRoundBtn")
+        self.horizontalLayout_2.addWidget(self.addRoundBtn)
+        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_2.addItem(spacerItem1)
+        self.verticalLayout_3.addLayout(self.horizontalLayout_2)
+        self.horizontalLayout_6 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_6.setObjectName("horizontalLayout_6")
+        self.warsTree = QtWidgets.QTreeWidget(parent=self.warsTab)
+        self.warsTree.setObjectName("warsTree")
+        self.horizontalLayout_6.addWidget(self.warsTree)
         self.selectedDetailsStack = QtWidgets.QStackedWidget(parent=self.warsTab)
-        self.selectedDetailsStack.setGeometry(QtCore.QRect(239, 59, 511, 431))
         self.selectedDetailsStack.setObjectName("selectedDetailsStack")
         self.pageEmpty = QtWidgets.QWidget()
         self.pageEmpty.setObjectName("pageEmpty")
+        self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.pageEmpty)
+        self.verticalLayout_4.setObjectName("verticalLayout_4")
+        self.horizontalLayout_7 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_7.setSizeConstraint(QtWidgets.QLayout.SizeConstraint.SetDefaultConstraint)
+        self.horizontalLayout_7.setObjectName("horizontalLayout_7")
+        spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_7.addItem(spacerItem2)
         self.labelSelect = QtWidgets.QLabel(parent=self.pageEmpty)
-        self.labelSelect.setGeometry(QtCore.QRect(110, 30, 301, 51))
         self.labelSelect.setObjectName("labelSelect")
+        self.horizontalLayout_7.addWidget(self.labelSelect)
+        spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_7.addItem(spacerItem3)
+        self.verticalLayout_4.addLayout(self.horizontalLayout_7)
         self.selectedDetailsStack.addWidget(self.pageEmpty)
         self.pageWar = QtWidgets.QWidget()
         self.pageWar.setObjectName("pageWar")
-        self.warName = QtWidgets.QLabel(parent=self.pageWar)
-        self.warName.setGeometry(QtCore.QRect(10, 10, 241, 16))
-        font = QtGui.QFont()
-        font.setPointSize(12)
-        self.warName.setFont(font)
-        self.warName.setObjectName("warName")
-        self.warYear = QtWidgets.QLabel(parent=self.pageWar)
-        self.warYear.setGeometry(QtCore.QRect(280, 10, 71, 16))
-        font = QtGui.QFont()
-        font.setPointSize(12)
-        self.warYear.setFont(font)
-        self.warYear.setObjectName("warYear")
-        self.labelParticipants = QtWidgets.QLabel(parent=self.pageWar)
-        self.labelParticipants.setGeometry(QtCore.QRect(10, 150, 111, 16))
-        self.labelParticipants.setObjectName("labelParticipants")
-        self.addWarParticipantBtn = QtWidgets.QPushButton(parent=self.pageWar)
-        self.addWarParticipantBtn.setGeometry(QtCore.QRect(420, 270, 81, 23))
-        self.addWarParticipantBtn.setObjectName("addWarParticipantBtn")
+        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.warParticipantsTable.setGeometry(QtCore.QRect(10, 170, 401, 211))
         self.warParticipantsTable.setObjectName("warParticipantsTable")
         self.warParticipantsTable.setColumnCount(5)
         self.warParticipantsTable.setRowCount(0)
@@ -102,12 +113,14 @@ class Ui_MainWindow(object):
         self.warParticipantsTable.setHorizontalHeaderItem(3, item)
         item = QtWidgets.QTableWidgetItem()
         self.warParticipantsTable.setHorizontalHeaderItem(4, item)
-        self.endWarBtn = QtWidgets.QPushButton(parent=self.pageWar)
-        self.endWarBtn.setEnabled(True)
-        self.endWarBtn.setGeometry(QtCore.QRect(230, 400, 61, 23))
-        self.endWarBtn.setObjectName("endWarBtn")
+        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.horizontalLayout_9 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_9.setObjectName("horizontalLayout_9")
         self.objectivesTable = QtWidgets.QTableWidget(parent=self.pageWar)
-        self.objectivesTable.setGeometry(QtCore.QRect(10, 60, 401, 71))
         self.objectivesTable.setObjectName("objectivesTable")
         self.objectivesTable.setColumnCount(2)
         self.objectivesTable.setRowCount(0)
@@ -115,57 +128,62 @@ class Ui_MainWindow(object):
         self.objectivesTable.setHorizontalHeaderItem(0, item)
         item = QtWidgets.QTableWidgetItem()
         self.objectivesTable.setHorizontalHeaderItem(1, item)
-        self.labelObjectives = QtWidgets.QLabel(parent=self.pageWar)
-        self.labelObjectives.setGeometry(QtCore.QRect(10, 40, 111, 20))
-        self.labelObjectives.setObjectName("labelObjectives")
+        self.horizontalLayout_9.addWidget(self.objectivesTable)
         self.addObjectiveBtn = QtWidgets.QPushButton(parent=self.pageWar)
         self.addObjectiveBtn.setEnabled(True)
-        self.addObjectiveBtn.setGeometry(QtCore.QRect(420, 80, 91, 23))
         font = QtGui.QFont()
         font.setPointSize(10)
         self.addObjectiveBtn.setFont(font)
         self.addObjectiveBtn.setObjectName("addObjectiveBtn")
+        self.horizontalLayout_9.addWidget(self.addObjectiveBtn)
+        self.gridLayout_3.addLayout(self.horizontalLayout_9, 2, 0, 1, 4)
+        spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.gridLayout_3.addItem(spacerItem4, 5, 3, 1, 1)
+        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.labelObjectives = QtWidgets.QLabel(parent=self.pageWar)
+        self.labelObjectives.setObjectName("labelObjectives")
+        self.gridLayout_3.addWidget(self.labelObjectives, 1, 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.selectedDetailsStack.addWidget(self.pageWar)
         self.pageCampaign = QtWidgets.QWidget()
         self.pageCampaign.setObjectName("pageCampaign")
-        self.campaignName = QtWidgets.QLabel(parent=self.pageCampaign)
-        self.campaignName.setGeometry(QtCore.QRect(10, 10, 241, 16))
-        font = QtGui.QFont()
-        font.setPointSize(12)
-        self.campaignName.setFont(font)
-        self.campaignName.setObjectName("campaignName")
+        self.gridLayout_4 = QtWidgets.QGridLayout(self.pageCampaign)
+        self.gridLayout_4.setObjectName("gridLayout_4")
         self.labelSectors = QtWidgets.QLabel(parent=self.pageCampaign)
-        self.labelSectors.setGeometry(QtCore.QRect(10, 40, 91, 16))
         self.labelSectors.setObjectName("labelSectors")
-        self.addCampaignParticipantBtn = QtWidgets.QPushButton(parent=self.pageCampaign)
-        self.addCampaignParticipantBtn.setGeometry(QtCore.QRect(420, 270, 75, 23))
-        self.addCampaignParticipantBtn.setObjectName("addCampaignParticipantBtn")
-        self.campaignMonth = QtWidgets.QLabel(parent=self.pageCampaign)
-        self.campaignMonth.setGeometry(QtCore.QRect(280, 10, 121, 16))
-        font = QtGui.QFont()
-        font.setPointSize(12)
-        self.campaignMonth.setFont(font)
-        self.campaignMonth.setObjectName("campaignMonth")
+        self.gridLayout_4.addWidget(self.labelSectors, 1, 0, 1, 1)
         self.labelParticipants_2 = QtWidgets.QLabel(parent=self.pageCampaign)
-        self.labelParticipants_2.setGeometry(QtCore.QRect(10, 180, 61, 16))
         self.labelParticipants_2.setObjectName("labelParticipants_2")
-        self.campaignParticipantsTable = QtWidgets.QTableWidget(parent=self.pageCampaign)
-        self.campaignParticipantsTable.setGeometry(QtCore.QRect(10, 200, 401, 181))
-        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.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)
+        spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.gridLayout_4.addItem(spacerItem5, 5, 2, 1, 1)
+        self.horizontalLayout_12 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_12.setObjectName("horizontalLayout_12")
         self.sectorsTable = QtWidgets.QTableWidget(parent=self.pageCampaign)
-        self.sectorsTable.setGeometry(QtCore.QRect(10, 60, 401, 101))
         self.sectorsTable.setObjectName("sectorsTable")
         self.sectorsTable.setColumnCount(5)
         self.sectorsTable.setRowCount(0)
@@ -179,43 +197,68 @@ class Ui_MainWindow(object):
         self.sectorsTable.setHorizontalHeaderItem(3, item)
         item = QtWidgets.QTableWidgetItem()
         self.sectorsTable.setHorizontalHeaderItem(4, item)
+        self.horizontalLayout_12.addWidget(self.sectorsTable)
         self.addSectorBtn = QtWidgets.QPushButton(parent=self.pageCampaign)
         self.addSectorBtn.setEnabled(True)
-        self.addSectorBtn.setGeometry(QtCore.QRect(420, 110, 71, 23))
         self.addSectorBtn.setObjectName("addSectorBtn")
-        self.endCampaignBtn = QtWidgets.QPushButton(parent=self.pageCampaign)
-        self.endCampaignBtn.setEnabled(True)
-        self.endCampaignBtn.setGeometry(QtCore.QRect(210, 400, 91, 23))
-        self.endCampaignBtn.setObjectName("endCampaignBtn")
+        self.horizontalLayout_12.addWidget(self.addSectorBtn)
+        self.gridLayout_4.addLayout(self.horizontalLayout_12, 4, 0, 1, 3)
+        self.horizontalLayout_13 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_13.setObjectName("horizontalLayout_13")
+        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_13.addWidget(self.campaignParticipantsTable)
+        self.addCampaignParticipantBtn = QtWidgets.QPushButton(parent=self.pageCampaign)
+        self.addCampaignParticipantBtn.setObjectName("addCampaignParticipantBtn")
+        self.horizontalLayout_13.addWidget(self.addCampaignParticipantBtn)
+        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.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.setGeometry(QtCore.QRect(10, 40, 91, 16))
         self.labelChoices.setObjectName("labelChoices")
-        self.choicesTable = QtWidgets.QTableWidget(parent=self.pageRound)
-        self.choicesTable.setGeometry(QtCore.QRect(10, 60, 301, 141))
-        self.choicesTable.setObjectName("choicesTable")
-        self.choicesTable.setColumnCount(3)
-        self.choicesTable.setRowCount(0)
-        item = QtWidgets.QTableWidgetItem()
-        self.choicesTable.setHorizontalHeaderItem(0, item)
-        item = QtWidgets.QTableWidgetItem()
-        self.choicesTable.setHorizontalHeaderItem(1, item)
-        item = QtWidgets.QTableWidgetItem()
-        self.choicesTable.setHorizontalHeaderItem(2, item)
-        self.roundNb = QtWidgets.QLabel(parent=self.pageRound)
-        self.roundNb.setGeometry(QtCore.QRect(10, 10, 241, 16))
-        font = QtGui.QFont()
-        font.setPointSize(12)
-        self.roundNb.setFont(font)
-        self.roundNb.setObjectName("roundNb")
-        self.resolvePairingBtn = QtWidgets.QPushButton(parent=self.pageRound)
-        self.resolvePairingBtn.setEnabled(True)
-        self.resolvePairingBtn.setGeometry(QtCore.QRect(320, 110, 91, 23))
-        self.resolvePairingBtn.setObjectName("resolvePairingBtn")
+        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)
+        spacerItem6 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.gridLayout_5.addItem(spacerItem6, 5, 2, 1, 1)
+        self.horizontalLayout_15 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_15.setObjectName("horizontalLayout_15")
         self.battlesTable = QtWidgets.QTableWidget(parent=self.pageRound)
-        self.battlesTable.setGeometry(QtCore.QRect(10, 240, 301, 111))
         self.battlesTable.setObjectName("battlesTable")
         self.battlesTable.setColumnCount(3)
         self.battlesTable.setRowCount(0)
@@ -225,24 +268,49 @@ class Ui_MainWindow(object):
         self.battlesTable.setHorizontalHeaderItem(1, item)
         item = QtWidgets.QTableWidgetItem()
         self.battlesTable.setHorizontalHeaderItem(2, item)
+        self.horizontalLayout_15.addWidget(self.battlesTable)
         self.enterResultBtn = QtWidgets.QPushButton(parent=self.pageRound)
         self.enterResultBtn.setEnabled(True)
-        self.enterResultBtn.setGeometry(QtCore.QRect(320, 290, 91, 23))
         self.enterResultBtn.setObjectName("enterResultBtn")
-        self.endRoundBtn = QtWidgets.QPushButton(parent=self.pageRound)
-        self.endRoundBtn.setEnabled(True)
-        self.endRoundBtn.setGeometry(QtCore.QRect(220, 400, 71, 23))
-        self.endRoundBtn.setObjectName("endRoundBtn")
-        self.labelBattles = QtWidgets.QLabel(parent=self.pageRound)
-        self.labelBattles.setGeometry(QtCore.QRect(10, 220, 91, 16))
-        self.labelBattles.setObjectName("labelBattles")
+        self.horizontalLayout_15.addWidget(self.enterResultBtn)
+        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.choicesTable.setObjectName("choicesTable")
+        self.choicesTable.setColumnCount(3)
+        self.choicesTable.setRowCount(0)
+        item = QtWidgets.QTableWidgetItem()
+        self.choicesTable.setHorizontalHeaderItem(0, item)
+        item = QtWidgets.QTableWidgetItem()
+        self.choicesTable.setHorizontalHeaderItem(1, item)
+        item = QtWidgets.QTableWidgetItem()
+        self.choicesTable.setHorizontalHeaderItem(2, item)
+        self.horizontalLayout_16.addWidget(self.choicesTable)
+        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.selectedDetailsStack.addWidget(self.pageRound)
+        self.horizontalLayout_6.addWidget(self.selectedDetailsStack)
+        self.verticalLayout_3.addLayout(self.horizontalLayout_6)
         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)
         MainWindow.setCentralWidget(self.centralwidget)
         self.menubar = QtWidgets.QMenuBar(parent=MainWindow)
-        self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 21))
+        self.menubar.setGeometry(QtCore.QRect(0, 0, 1288, 31))
         self.menubar.setObjectName("menubar")
         self.menuFile = QtWidgets.QMenu(parent=self.menubar)
         self.menuFile.setObjectName("menuFile")
@@ -317,12 +385,13 @@ class Ui_MainWindow(object):
 
         self.retranslateUi(MainWindow)
         self.tabWidget.setCurrentIndex(1)
-        self.selectedDetailsStack.setCurrentIndex(2)
+        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"))
         item = self.playersTable.horizontalHeaderItem(0)
         item.setText(_translate("MainWindow", "Name"))
         item = self.playersTable.horizontalHeaderItem(1)
@@ -331,16 +400,11 @@ class Ui_MainWindow(object):
         item.setText(_translate("MainWindow", "Wins"))
         item = self.playersTable.horizontalHeaderItem(3)
         item.setText(_translate("MainWindow", "Rewards"))
-        self.addPlayerBtn.setText(_translate("MainWindow", "Add player"))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.playersTab), _translate("MainWindow", "Players"))
         self.addWarBtn.setText(_translate("MainWindow", "Add war"))
         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.labelParticipants.setText(_translate("MainWindow", "Participants"))
-        self.addWarParticipantBtn.setText(_translate("MainWindow", "Add participant"))
         item = self.warParticipantsTable.horizontalHeaderItem(0)
         item.setText(_translate("MainWindow", "Name"))
         item = self.warParticipantsTable.horizontalHeaderItem(1)
@@ -351,28 +415,20 @@ class Ui_MainWindow(object):
         item.setText(_translate("MainWindow", "Victory pts."))
         item = self.warParticipantsTable.horizontalHeaderItem(4)
         item.setText(_translate("MainWindow", "Theme pts"))
-        self.endWarBtn.setText(_translate("MainWindow", "End war"))
+        self.addWarParticipantBtn.setText(_translate("MainWindow", "Add participant"))
         item = self.objectivesTable.horizontalHeaderItem(0)
         item.setText(_translate("MainWindow", "Name"))
         item = self.objectivesTable.horizontalHeaderItem(1)
         item.setText(_translate("MainWindow", "Description"))
-        self.labelObjectives.setText(_translate("MainWindow", "Objectives"))
         self.addObjectiveBtn.setText(_translate("MainWindow", "Add objective"))
-        self.campaignName.setText(_translate("MainWindow", "campaignName"))
+        self.endWarBtn.setText(_translate("MainWindow", "End war"))
+        self.labelParticipants.setText(_translate("MainWindow", "Participants"))
+        self.labelObjectives.setText(_translate("MainWindow", "Objectives"))
+        self.warName.setText(_translate("MainWindow", "warName"))
+        self.warYear.setText(_translate("MainWindow", "warYear"))
         self.labelSectors.setText(_translate("MainWindow", "Sectors"))
-        self.addCampaignParticipantBtn.setText(_translate("MainWindow", "Add participant"))
-        self.campaignMonth.setText(_translate("MainWindow", "campaignMonth"))
         self.labelParticipants_2.setText(_translate("MainWindow", "Participants"))
-        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"))
         item = self.sectorsTable.horizontalHeaderItem(0)
         item.setText(_translate("MainWindow", "Name"))
         item = self.sectorsTable.horizontalHeaderItem(1)
@@ -384,16 +440,22 @@ class Ui_MainWindow(object):
         item = self.sectorsTable.horizontalHeaderItem(4)
         item.setText(_translate("MainWindow", "Influence imp."))
         self.addSectorBtn.setText(_translate("MainWindow", "Add Sector"))
-        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.labelChoices.setText(_translate("MainWindow", "Choices"))
-        item = self.choicesTable.horizontalHeaderItem(0)
-        item.setText(_translate("MainWindow", "Player"))
-        item = self.choicesTable.horizontalHeaderItem(1)
-        item.setText(_translate("MainWindow", "Prioritary"))
-        item = self.choicesTable.horizontalHeaderItem(2)
-        item.setText(_translate("MainWindow", "Secondary"))
-        self.roundNb.setText(_translate("MainWindow", "Round Nb"))
-        self.resolvePairingBtn.setText(_translate("MainWindow", "Resolve pairing"))
+        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)
@@ -401,8 +463,14 @@ class Ui_MainWindow(object):
         item = self.battlesTable.horizontalHeaderItem(2)
         item.setText(_translate("MainWindow", "Player 2"))
         self.enterResultBtn.setText(_translate("MainWindow", "Enter results"))
-        self.endRoundBtn.setText(_translate("MainWindow", "End round"))
-        self.labelBattles.setText(_translate("MainWindow", "Battles"))
+        item = self.choicesTable.horizontalHeaderItem(0)
+        item.setText(_translate("MainWindow", "Player"))
+        item = self.choicesTable.horizontalHeaderItem(1)
+        item.setText(_translate("MainWindow", "Prioritary"))
+        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.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 ab0cc4f..5c4df48 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>914</width>
-    <height>527</height>
+    <width>1288</width>
+    <height>817</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -22,7 +22,7 @@
     <item>
      <widget class="QTabWidget" name="tabWidget">
       <property name="currentIndex">
-       <number>0</number>
+       <number>1</number>
       </property>
       <widget class="QWidget" name="playersTab">
        <attribute name="icon">
@@ -91,586 +91,533 @@
        <attribute name="title">
         <string>Wars</string>
        </attribute>
-       <widget class="QTreeWidget" name="warsTree">
-        <property name="geometry">
-         <rect>
-          <x>10</x>
-          <y>60</y>
-          <width>211</width>
-          <height>431</height>
-         </rect>
-        </property>
-        <column>
-         <property name="text">
-          <string notr="true"/>
-         </property>
-        </column>
-       </widget>
-       <widget class="QPushButton" name="addWarBtn">
-        <property name="geometry">
-         <rect>
-          <x>20</x>
-          <y>20</y>
-          <width>75</width>
-          <height>23</height>
-         </rect>
-        </property>
-        <property name="text">
-         <string>Add war</string>
-        </property>
-       </widget>
-       <widget class="QPushButton" name="addCampaignBtn">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="geometry">
-         <rect>
-          <x>110</x>
-          <y>20</y>
-          <width>91</width>
-          <height>23</height>
-         </rect>
-        </property>
-        <property name="text">
-         <string>Add Campaign</string>
-        </property>
-       </widget>
-       <widget class="QPushButton" name="addRoundBtn">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="geometry">
-         <rect>
-          <x>220</x>
-          <y>20</y>
-          <width>91</width>
-          <height>23</height>
-         </rect>
-        </property>
-        <property name="text">
-         <string>Add Round</string>
-        </property>
-       </widget>
-       <widget class="QStackedWidget" name="selectedDetailsStack">
-        <property name="geometry">
-         <rect>
-          <x>239</x>
-          <y>59</y>
-          <width>511</width>
-          <height>431</height>
-         </rect>
-        </property>
-        <property name="currentIndex">
-         <number>2</number>
-        </property>
-        <widget class="QWidget" name="pageEmpty">
-         <widget class="QLabel" name="labelSelect">
-          <property name="geometry">
-           <rect>
-            <x>110</x>
-            <y>30</y>
-            <width>301</width>
-            <height>51</height>
-           </rect>
-          </property>
-          <property name="text">
-           <string>Select an element within the tree to show/edit details.</string>
-          </property>
-         </widget>
-        </widget>
-        <widget class="QWidget" name="pageWar">
-         <widget class="QLabel" name="warName">
-          <property name="geometry">
-           <rect>
-            <x>10</x>
-            <y>10</y>
-            <width>241</width>
-            <height>16</height>
-           </rect>
-          </property>
-          <property name="font">
-           <font>
-            <pointsize>12</pointsize>
-           </font>
-          </property>
-          <property name="text">
-           <string>warName</string>
-          </property>
-         </widget>
-         <widget class="QLabel" name="warYear">
-          <property name="geometry">
-           <rect>
-            <x>280</x>
-            <y>10</y>
-            <width>71</width>
-            <height>16</height>
-           </rect>
-          </property>
-          <property name="font">
-           <font>
-            <pointsize>12</pointsize>
-           </font>
-          </property>
-          <property name="text">
-           <string>warYear</string>
-          </property>
-         </widget>
-         <widget class="QLabel" name="labelParticipants">
-          <property name="geometry">
-           <rect>
-            <x>10</x>
-            <y>150</y>
-            <width>111</width>
-            <height>16</height>
-           </rect>
-          </property>
-          <property name="text">
-           <string>Participants</string>
-          </property>
-         </widget>
-         <widget class="QPushButton" name="addWarParticipantBtn">
-          <property name="geometry">
-           <rect>
-            <x>420</x>
-            <y>270</y>
-            <width>81</width>
-            <height>23</height>
-           </rect>
-          </property>
-          <property name="text">
-           <string>Add participant</string>
-          </property>
-         </widget>
-         <widget class="QTableWidget" name="warParticipantsTable">
-          <property name="geometry">
-           <rect>
-            <x>10</x>
-            <y>170</y>
-            <width>401</width>
-            <height>211</height>
-           </rect>
-          </property>
-          <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>
-         <widget class="QPushButton" name="endWarBtn">
-          <property name="enabled">
-           <bool>true</bool>
-          </property>
-          <property name="geometry">
-           <rect>
-            <x>230</x>
-            <y>400</y>
-            <width>61</width>
-            <height>23</height>
-           </rect>
-          </property>
-          <property name="text">
-           <string>End war</string>
-          </property>
-         </widget>
-         <widget class="QTableWidget" name="objectivesTable">
-          <property name="geometry">
-           <rect>
-            <x>10</x>
-            <y>60</y>
-            <width>401</width>
-            <height>71</height>
-           </rect>
-          </property>
-          <column>
-           <property name="text">
-            <string>Name</string>
-           </property>
-          </column>
-          <column>
-           <property name="text">
-            <string>Description</string>
-           </property>
-          </column>
-         </widget>
-         <widget class="QLabel" name="labelObjectives">
-          <property name="geometry">
-           <rect>
-            <x>10</x>
-            <y>40</y>
-            <width>111</width>
-            <height>20</height>
-           </rect>
-          </property>
-          <property name="text">
-           <string>Objectives</string>
-          </property>
-         </widget>
-         <widget class="QPushButton" name="addObjectiveBtn">
-          <property name="enabled">
-           <bool>true</bool>
-          </property>
-          <property name="geometry">
-           <rect>
-            <x>420</x>
-            <y>80</y>
-            <width>91</width>
-            <height>23</height>
-           </rect>
-          </property>
-          <property name="font">
-           <font>
-            <pointsize>10</pointsize>
-           </font>
-          </property>
-          <property name="text">
-           <string>Add objective</string>
-          </property>
-         </widget>
-        </widget>
-        <widget class="QWidget" name="pageCampaign">
-         <widget class="QLabel" name="campaignName">
-          <property name="geometry">
-           <rect>
-            <x>10</x>
-            <y>10</y>
-            <width>241</width>
-            <height>16</height>
-           </rect>
-          </property>
-          <property name="font">
-           <font>
-            <pointsize>12</pointsize>
-           </font>
-          </property>
-          <property name="text">
-           <string>campaignName</string>
-          </property>
-         </widget>
-         <widget class="QLabel" name="labelSectors">
-          <property name="geometry">
-           <rect>
-            <x>10</x>
-            <y>40</y>
-            <width>91</width>
-            <height>16</height>
-           </rect>
-          </property>
-          <property name="text">
-           <string>Sectors</string>
-          </property>
-         </widget>
-         <widget class="QPushButton" name="addCampaignParticipantBtn">
-          <property name="geometry">
-           <rect>
-            <x>420</x>
-            <y>270</y>
-            <width>75</width>
-            <height>23</height>
-           </rect>
-          </property>
-          <property name="text">
-           <string>Add participant</string>
-          </property>
-         </widget>
-         <widget class="QLabel" name="campaignMonth">
-          <property name="geometry">
-           <rect>
-            <x>280</x>
-            <y>10</y>
-            <width>121</width>
-            <height>16</height>
-           </rect>
-          </property>
-          <property name="font">
-           <font>
-            <pointsize>12</pointsize>
-           </font>
-          </property>
-          <property name="text">
-           <string>campaignMonth</string>
-          </property>
-         </widget>
-         <widget class="QLabel" name="labelParticipants_2">
-          <property name="geometry">
-           <rect>
-            <x>10</x>
-            <y>180</y>
-            <width>61</width>
-            <height>16</height>
-           </rect>
-          </property>
-          <property name="text">
-           <string>Participants</string>
-          </property>
-         </widget>
-         <widget class="QTableWidget" name="campaignParticipantsTable">
-          <property name="geometry">
-           <rect>
-            <x>10</x>
-            <y>200</y>
-            <width>401</width>
-            <height>181</height>
-           </rect>
-          </property>
-          <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>
-         <widget class="QTableWidget" name="sectorsTable">
-          <property name="geometry">
-           <rect>
-            <x>10</x>
-            <y>60</y>
-            <width>401</width>
-            <height>101</height>
-           </rect>
-          </property>
-          <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>
-         </widget>
-         <widget class="QPushButton" name="addSectorBtn">
-          <property name="enabled">
-           <bool>true</bool>
-          </property>
-          <property name="geometry">
-           <rect>
-            <x>420</x>
-            <y>110</y>
-            <width>71</width>
-            <height>23</height>
-           </rect>
-          </property>
-          <property name="text">
-           <string>Add Sector</string>
-          </property>
-         </widget>
-         <widget class="QPushButton" name="endCampaignBtn">
-          <property name="enabled">
-           <bool>true</bool>
-          </property>
-          <property name="geometry">
-           <rect>
-            <x>210</x>
-            <y>400</y>
-            <width>91</width>
-            <height>23</height>
-           </rect>
-          </property>
-          <property name="text">
-           <string>End campaign</string>
-          </property>
-         </widget>
-        </widget>
-        <widget class="QWidget" name="pageRound">
-         <widget class="QLabel" name="labelChoices">
-          <property name="geometry">
-           <rect>
-            <x>10</x>
-            <y>40</y>
-            <width>91</width>
-            <height>16</height>
-           </rect>
-          </property>
-          <property name="text">
-           <string>Choices</string>
-          </property>
-         </widget>
-         <widget class="QTableWidget" name="choicesTable">
-          <property name="geometry">
-           <rect>
-            <x>10</x>
-            <y>60</y>
-            <width>301</width>
-            <height>141</height>
-           </rect>
-          </property>
-          <column>
-           <property name="text">
-            <string>Player</string>
-           </property>
-          </column>
-          <column>
-           <property name="text">
-            <string>Prioritary</string>
-           </property>
-          </column>
-          <column>
-           <property name="text">
-            <string>Secondary</string>
-           </property>
-          </column>
-         </widget>
-         <widget class="QLabel" name="roundNb">
-          <property name="geometry">
-           <rect>
-            <x>10</x>
-            <y>10</y>
-            <width>241</width>
-            <height>16</height>
-           </rect>
-          </property>
-          <property name="font">
-           <font>
-            <pointsize>12</pointsize>
-           </font>
-          </property>
-          <property name="text">
-           <string>Round Nb</string>
-          </property>
-         </widget>
-         <widget class="QPushButton" name="resolvePairingBtn">
-          <property name="enabled">
-           <bool>true</bool>
-          </property>
-          <property name="geometry">
-           <rect>
-            <x>320</x>
-            <y>110</y>
-            <width>91</width>
-            <height>23</height>
-           </rect>
-          </property>
-          <property name="text">
-           <string>Resolve pairing</string>
-          </property>
-         </widget>
-         <widget class="QTableWidget" name="battlesTable">
-          <property name="geometry">
-           <rect>
-            <x>10</x>
-            <y>240</y>
-            <width>301</width>
-            <height>111</height>
-           </rect>
-          </property>
-          <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>
-         <widget class="QPushButton" name="enterResultBtn">
-          <property name="enabled">
-           <bool>true</bool>
-          </property>
-          <property name="geometry">
-           <rect>
-            <x>320</x>
-            <y>290</y>
-            <width>91</width>
-            <height>23</height>
-           </rect>
-          </property>
-          <property name="text">
-           <string>Enter results</string>
-          </property>
-         </widget>
-         <widget class="QPushButton" name="endRoundBtn">
-          <property name="enabled">
-           <bool>true</bool>
-          </property>
-          <property name="geometry">
-           <rect>
-            <x>220</x>
-            <y>400</y>
-            <width>71</width>
-            <height>23</height>
-           </rect>
-          </property>
-          <property name="text">
-           <string>End round</string>
-          </property>
-         </widget>
-         <widget class="QLabel" name="labelBattles">
-          <property name="geometry">
-           <rect>
-            <x>10</x>
-            <y>220</y>
-            <width>91</width>
-            <height>16</height>
-           </rect>
-          </property>
-          <property name="text">
-           <string>Battles</string>
-          </property>
-         </widget>
-        </widget>
-       </widget>
+       <layout class="QVBoxLayout" name="verticalLayout_3">
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <item>
+           <widget class="QPushButton" name="addWarBtn">
+            <property name="text">
+             <string>Add war</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="addCampaignBtn">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string>Add Campaign</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="addRoundBtn">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string>Add Round</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer_3">
+            <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_6">
+          <item>
+           <widget class="QTreeWidget" name="warsTree">
+            <column>
+             <property name="text">
+              <string notr="true"/>
+             </property>
+            </column>
+           </widget>
+          </item>
+          <item>
+           <widget class="QStackedWidget" name="selectedDetailsStack">
+            <property name="currentIndex">
+             <number>3</number>
+            </property>
+            <widget class="QWidget" name="pageEmpty">
+             <layout class="QVBoxLayout" name="verticalLayout_4">
+              <item>
+               <layout class="QHBoxLayout" name="horizontalLayout_7">
+                <property name="sizeConstraint">
+                 <enum>QLayout::SetDefaultConstraint</enum>
+                </property>
+                <item>
+                 <spacer name="horizontalSpacer_2">
+                  <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="labelSelect">
+                  <property name="text">
+                   <string>Select an element within the tree to show/edit details.</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <spacer name="horizontalSpacer_4">
+                  <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>
+            </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="2" column="0" colspan="4">
+               <layout class="QHBoxLayout" name="horizontalLayout_9">
+                <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>
+                </item>
+                <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>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+              <item row="5" column="3">
+               <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 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="1" column="0">
+               <widget class="QLabel" name="labelObjectives">
+                <property name="text">
+                 <string>Objectives</string>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="0" colspan="4">
+               <layout class="QHBoxLayout" name="horizontalLayout_8">
+                <item>
+                 <widget class="QLabel" name="warName">
+                  <property name="font">
+                   <font>
+                    <pointsize>12</pointsize>
+                   </font>
+                  </property>
+                  <property name="text">
+                   <string>warName</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QLabel" name="warYear">
+                  <property name="font">
+                   <font>
+                    <pointsize>12</pointsize>
+                   </font>
+                  </property>
+                  <property name="text">
+                   <string>warYear</string>
+                  </property>
+                 </widget>
+                </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="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>
+                 </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="2" column="0" colspan="3">
+               <layout class="QHBoxLayout" name="horizontalLayout_13">
+                <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="0" column="0" colspan="3">
+               <layout class="QHBoxLayout" name="horizontalLayout_11">
+                <item>
+                 <widget class="QLabel" name="campaignName">
+                  <property name="font">
+                   <font>
+                    <pointsize>12</pointsize>
+                   </font>
+                  </property>
+                  <property name="text">
+                   <string>campaignName</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QLabel" name="campaignMonth">
+                  <property name="font">
+                   <font>
+                    <pointsize>12</pointsize>
+                   </font>
+                  </property>
+                  <property name="text">
+                   <string>campaignMonth</string>
+                  </property>
+                 </widget>
+                </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>
+                </property>
+               </widget>
+              </item>
+              <item row="3" column="0">
+               <widget class="QLabel" name="labelBattles">
+                <property name="text">
+                 <string>Battles</string>
+                </property>
+               </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>
+                 <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>
+                </item>
+                <item>
+                 <widget class="QPushButton" name="enterResultBtn">
+                  <property name="enabled">
+                   <bool>true</bool>
+                  </property>
+                  <property name="text">
+                   <string>Enter results</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+              <item row="2" column="0" colspan="3">
+               <layout class="QHBoxLayout" name="horizontalLayout_16">
+                <item>
+                 <widget class="QTableWidget" name="choicesTable">
+                  <column>
+                   <property name="text">
+                    <string>Player</string>
+                   </property>
+                  </column>
+                  <column>
+                   <property name="text">
+                    <string>Prioritary</string>
+                   </property>
+                  </column>
+                  <column>
+                   <property name="text">
+                    <string>Secondary</string>
+                   </property>
+                  </column>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QPushButton" name="resolvePairingBtn">
+                  <property name="enabled">
+                   <bool>true</bool>
+                  </property>
+                  <property name="text">
+                   <string>Resolve pairing</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+              <item row="0" column="0" colspan="3">
+               <layout class="QHBoxLayout" name="horizontalLayout_14">
+                <item>
+                 <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>
+             </layout>
+            </widget>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
       </widget>
      </widget>
     </item>
@@ -681,7 +628,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>914</width>
+     <width>1288</width>
      <height>31</height>
     </rect>
    </property>