diff --git a/src/components/Modules/FourLayerPaperStrawCalculate.vue b/src/components/Modules/FourLayerPaperStrawCalculate.vue
index a5648af..3f847c5 100644
--- a/src/components/Modules/FourLayerPaperStrawCalculate.vue
+++ b/src/components/Modules/FourLayerPaperStrawCalculate.vue
@@ -66,68 +66,84 @@
             />
             {{ $t('results') }}
           </v-card-title>
-          <v-row>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.paperTubeInnerDiameter')}`"
-                :value="result.paperCoreDiameter"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.paperTubeExternalDiameter')}`"
-                :value="result.paperTubeExternalDiameter"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.paperTubeThickness')}`"
-                :value="result.paperTubeWallThickness"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.bottomPaperAngle')}`"
-                :value="result.bottomPaperAngle"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.leadingLength')}`"
-                :value="result.leadingLength"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.bottomPaperWidth')}`"
-                :value="result.bottomPaperWidth"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.secondLayerPaperWidth')}`"
-                :value="result.secondLayerPaperWidth"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.thirdLayerPaperWidth')}`"
-                :value="result.thirdLayerPaperWidth"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.topPaperWidth')}`"
-                :value="result.topPaperWidth"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.beltWidth')}`"
-                :value="result.beltWidth"
-              />
-            </v-col>
-          </v-row>
+          <v-list lines="two">
+            <result-section
+              :label="`${$t('paperStrawResult.paperTubeInnerDiameter')}`"
+              :value="result.paperCoreDiameter"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.paperTubeExternalDiameter')}`"
+              :value="result.paperTubeExternalDiameter"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.paperTubeThickness')}`"
+              :value="result.paperTubeWallThickness"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.bottomPaperAngle')}`"
+              :value="result.bottomPaperAngle"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.leadingLength')}`"
+              :value="result.leadingLength"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.bottomPaperWidth')}`"
+              :value="result.bottomPaperWidth"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.secondLayerPaperWidth')}`"
+              :value="result.secondLayerPaperWidth"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.thirdLayerPaperWidth')}`"
+              :value="result.thirdLayerPaperWidth"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.topPaperWidth')}`"
+              :value="result.topPaperWidth"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.beltWidth')}`"
+              :value="result.beltWidth"
+            />
+          </v-list>
+
+          <v-expansion-panels flat multiple>
+            <v-expansion-panel hide-actions>
+              <v-expansion-panel-title class="text-warning font-weight-bold">
+                <template #default="{ expanded }">
+                  <span>
+                    <v-icon icon="mdi-information-outline" />
+                    {{ expanded ? $t('calculationParameters') : $t('expandToShowCalculationParameters') }}
+                  </span>
+                </template>
+              </v-expansion-panel-title>
+              <v-expansion-panel-text>
+                <v-row>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('paperTubeInnerDiameter')" :value="paperCoreDiameter" />
+                  </v-col>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('bottomPaperWidth')" :value="bottomPaperWidth" />
+                  </v-col>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('bottomPaperThickness')" :value="bottomPaperThickness" />
+                  </v-col>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('secondLayerPaperThickness')" :value="secondLayerPaperThickness" />
+                  </v-col>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('thirdLayerPaperThickness')" :value="thirdLayerPaperThickness" />
+                  </v-col>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('topPaperThickness')" :value="topPaperThickness" />
+                  </v-col>
+                </v-row>
+              </v-expansion-panel-text>
+            </v-expansion-panel>
+          </v-expansion-panels>
+
         </v-card>
       </v-col>
     </v-row>
diff --git a/src/components/Modules/ThreeLayerPaperStrawCalculate.vue b/src/components/Modules/ThreeLayerPaperStrawCalculate.vue
index 7a6cf96..cf8f6ac 100644
--- a/src/components/Modules/ThreeLayerPaperStrawCalculate.vue
+++ b/src/components/Modules/ThreeLayerPaperStrawCalculate.vue
@@ -63,62 +63,76 @@
             />
             {{ $t('results') }}
           </v-card-title>
-          <v-row>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.paperTubeInnerDiameter')}`"
-                :value="result.paperCoreDiameter"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.paperTubeExternalDiameter')}`"
-                :value="result.paperTubeExternalDiameter"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.paperTubeThickness')}`"
-                :value="result.paperTubeWallThickness"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.bottomPaperAngle')}`"
-                :value="result.bottomPaperAngle"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.leadingLength')}`"
-                :value="result.leadingLength"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.bottomPaperWidth')}`"
-                :value="result.bottomPaperWidth"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.middlePaperWidth')}`"
-                :value="result.middlePaperWidth"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.topPaperWidth')}`"
-                :value="result.topPaperWidth"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.beltWidth')}`"
-                :value="result.beltWidth"
-              />
-            </v-col>
-          </v-row>
+          <v-list lines="two">
+            <result-section
+              :label="`${$t('paperStrawResult.paperTubeInnerDiameter')}`"
+              :value="result.paperCoreDiameter"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.paperTubeExternalDiameter')}`"
+              :value="result.paperTubeExternalDiameter"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.paperTubeThickness')}`"
+              :value="result.paperTubeWallThickness"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.bottomPaperAngle')}`"
+              :value="result.bottomPaperAngle"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.leadingLength')}`"
+              :value="result.leadingLength"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.bottomPaperWidth')}`"
+              :value="result.bottomPaperWidth"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.middlePaperWidth')}`"
+              :value="result.middlePaperWidth"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.topPaperWidth')}`"
+              :value="result.topPaperWidth"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.beltWidth')}`"
+              :value="result.beltWidth"
+            />
+          </v-list>
+
+          <v-expansion-panels flat multiple>
+            <v-expansion-panel hide-actions>
+              <v-expansion-panel-title class="text-warning font-weight-bold">
+                <template #default="{ expanded }">
+                  <span>
+                    <v-icon icon="mdi-information-outline" />
+                    {{ expanded ? $t('calculationParameters') : $t('expandToShowCalculationParameters') }}
+                  </span>
+                </template>
+              </v-expansion-panel-title>
+              <v-expansion-panel-text>
+                <v-row>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('paperTubeInnerDiameter')" :value="paperCoreDiameter" />
+                  </v-col>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('bottomPaperWidth')" :value="bottomPaperWidth" />
+                  </v-col>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('bottomPaperThickness')" :value="bottomPaperThickness" />
+                  </v-col>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('middlePaperThickness')" :value="middlePaperThickness" />
+                  </v-col>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('topPaperThickness')" :value="topPaperThickness" />
+                  </v-col>
+                </v-row>
+              </v-expansion-panel-text>
+            </v-expansion-panel>
+          </v-expansion-panels>
         </v-card>
       </v-col>
     </v-row>