diff --git a/Software/PC_Application/Device/device.cpp b/Software/PC_Application/Device/device.cpp
index fcbc94a..2591cda 100644
--- a/Software/PC_Application/Device/device.cpp
+++ b/Software/PC_Application/Device/device.cpp
@@ -107,15 +107,15 @@ uint8_t *USBInBuffer::getBuffer() const
 }
 
 static Protocol::DeviceLimits limits = {
-    .minFreq = 1000000,
+    .minFreq = 0,
     .maxFreq = 6000000000,
     .minIFBW = 10,
-    .maxIFBW = 10000,
+    .maxIFBW = 50000,
     .maxPoints = 4501,
     .cdbm_min = -4000,
-    .cdbm_max = -1000,
+    .cdbm_max = 0,
     .minRBW = 10,
-    .maxRBW = 10000,
+    .maxRBW = 100000,
 };
 
 Device::Device(QString serial)
diff --git a/Software/PC_Application/Traces/markerwidget.cpp b/Software/PC_Application/Traces/markerwidget.cpp
index 391d7b8..072d26f 100644
--- a/Software/PC_Application/Traces/markerwidget.cpp
+++ b/Software/PC_Application/Traces/markerwidget.cpp
@@ -12,6 +12,10 @@ MarkerWidget::MarkerWidget(TraceMarkerModel &model, QWidget *parent) :
     ui->tableView->setItemDelegateForColumn(TraceMarkerModel::ColIndexType, new MarkerTypeDelegate);
     ui->tableView->setItemDelegateForColumn(TraceMarkerModel::ColIndexSettings, new MarkerSettingsDelegate);
 
+    ui->tableView->setColumnWidth(TraceMarkerModel::ColIndexNumber, 21);
+    ui->tableView->setColumnWidth(TraceMarkerModel::ColIndexTrace, 80);
+    ui->tableView->setColumnWidth(TraceMarkerModel::ColIndexType, 150);
+
     connect(&model.getModel(), &TraceModel::traceAdded, this, &MarkerWidget::updatePersistentEditors);
     connect(&model.getModel(), &TraceModel::traceRemoved, this, &MarkerWidget::updatePersistentEditors);
 }
diff --git a/Software/PC_Application/Traces/markerwidget.ui b/Software/PC_Application/Traces/markerwidget.ui
index fdedbd2..2850bfe 100644
--- a/Software/PC_Application/Traces/markerwidget.ui
+++ b/Software/PC_Application/Traces/markerwidget.ui
@@ -19,12 +19,18 @@
      <property name="selectionBehavior">
       <enum>QAbstractItemView::SelectRows</enum>
      </property>
+     <attribute name="horizontalHeaderMinimumSectionSize">
+      <number>21</number>
+     </attribute>
      <attribute name="horizontalHeaderStretchLastSection">
       <bool>true</bool>
      </attribute>
      <attribute name="verticalHeaderVisible">
       <bool>false</bool>
      </attribute>
+     <attribute name="verticalHeaderDefaultSectionSize">
+      <number>21</number>
+     </attribute>
     </widget>
    </item>
    <item>
diff --git a/Software/PC_Application/main.ui b/Software/PC_Application/main.ui
index c274ce9..f06b85a 100644
--- a/Software/PC_Application/main.ui
+++ b/Software/PC_Application/main.ui
@@ -20,7 +20,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>21</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">