diff --git a/MVMCoreUI/Molecules/Doughnut/DoughnutChart.swift b/MVMCoreUI/Molecules/Doughnut/DoughnutChart.swift
index 130536e4..03d87ec9 100644
--- a/MVMCoreUI/Molecules/Doughnut/DoughnutChart.swift
+++ b/MVMCoreUI/Molecules/Doughnut/DoughnutChart.swift
@@ -176,7 +176,7 @@ open class DoughnutChart: View {
         labelContainer.layoutIfNeeded()
         let radius = sizeObject.getValueBasedOnApplicationWidth()/2 - lineWidth()
         let labelheight = labelContainer.frame.height/2
-        let padding = sizeObject.getValueBasedOnApplicationWidth()/2 - sqrt(pow(radius, 2) - pow(labelheight, 2))
+        let padding = sizeObject.getValueBasedOnApplicationWidth()/2 - sqrt(max(0, pow(radius, 2) - pow(labelheight, 2)))
         
         labelContainerLeftConstraint?.constant = padding
         labelContainerRightConstraint?.constant = padding
diff --git a/MVMCoreUI/Molecules/Doughnut/DoughnutChartView.swift b/MVMCoreUI/Molecules/Doughnut/DoughnutChartView.swift
index 72aceab7..e33601ad 100644
--- a/MVMCoreUI/Molecules/Doughnut/DoughnutChartView.swift
+++ b/MVMCoreUI/Molecules/Doughnut/DoughnutChartView.swift
@@ -26,7 +26,7 @@ import Foundation
         addSubview(colorLablesStack)
         
         doughnutChart.leadingAnchor.constraint(equalTo: leadingAnchor).isActive = true
-        doughnutChart.topAnchor.constraint(equalTo: topAnchor, constant: PaddingFour).isActive = true
+        doughnutChart.topAnchor.constraint(equalTo: topAnchor).isActive = true
         bottomAnchor.constraint(greaterThanOrEqualTo: doughnutChart.bottomAnchor).isActive = true
         
         let doughnutBottomAnchor = bottomAnchor.constraint(equalTo: doughnutChart.bottomAnchor)
diff --git a/MVMCoreUI/Molecules/VerticalCombinationViews/Lists/NumberedListModel.swift b/MVMCoreUI/Molecules/VerticalCombinationViews/Lists/NumberedListModel.swift
index 857ef7bc..554255d6 100644
--- a/MVMCoreUI/Molecules/VerticalCombinationViews/Lists/NumberedListModel.swift
+++ b/MVMCoreUI/Molecules/VerticalCombinationViews/Lists/NumberedListModel.swift
@@ -26,7 +26,7 @@ import Foundation
         let list = try typeContainer.decodeMolecules(codingKey: .list)
         var models: [MoleculeStackItemModel] = []
         for (index, molecule) in list.enumerated() {
-            models.append(MoleculeStackItemModel(with: StringAndMoleculeModel(string: "\(index).", molecule: molecule)))
+            models.append(MoleculeStackItemModel(with: StringAndMoleculeModel(string: "\(index+1).", molecule: molecule)))
         }
         super.init(molecules: models)
         spacing = 0