diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/QuadFlatPackageWidget.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/QuadFlatPackageWidget.cpp
index 3ff53269..9468ac48 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/QuadFlatPackageWidget.cpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/QuadFlatPackageWidget.cpp
@@ -65,16 +65,16 @@ QuadFlatPackageWidget::QuadFlatPackageWidget(
         this->pinWidgets.push_back(pinWidget);
         TargetPackageWidget::pinWidgets.push_back(pinWidget);
 
-        if (targetPinNumber <= pinCountPerLayout) {
+        if (pinWidget->position == Position::LEFT) {
             this->leftPinLayout->addWidget(pinWidget, 0, Qt::AlignmentFlag::AlignRight);
 
-        } else if (targetPinNumber > pinCountPerLayout && targetPinNumber <= (pinCountPerLayout * 2)) {
+        } else if (pinWidget->position == Position::BOTTOM) {
             this->bottomPinLayout->addWidget(pinWidget, 0, Qt::AlignmentFlag::AlignTop);
 
-        } else if (targetPinNumber > (pinCountPerLayout * 2) && targetPinNumber <= (pinCountPerLayout * 3)) {
+        } else if (pinWidget->position == Position::RIGHT) {
             this->rightPinLayout->addWidget(pinWidget, 0, Qt::AlignmentFlag::AlignLeft);
 
-        } else if (targetPinNumber > (pinCountPerLayout * 3) && targetPinNumber <= (pinCountPerLayout * 4)) {
+        } else if (pinWidget->position == Position::TOP) {
             this->topPinLayout->addWidget(pinWidget, 0, Qt::AlignmentFlag::AlignBottom);
         }
     }
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/Stylesheets/QuadFlatPackage.qss b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/Stylesheets/QuadFlatPackage.qss
index 6f14a1f4..bf5aac2d 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/Stylesheets/QuadFlatPackage.qss
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/Stylesheets/QuadFlatPackage.qss
@@ -1,18 +1,5 @@
 #target-pin-number {
-    font-size: 14px;
-}
-
-#target-pin-name {
-    font-size: 11px;
-}
-
-#target-pin-name {
-    color: #a6a7aa;
-}
-
-#target-pin-direction {
-    color: #8a8a8d;
-    font-size: 10px;
+    font-size: 13px;
 }
 
 #target-pin-body {