diff --git a/.github/ISSUE_TEMPLATE/sample-usecase-template.yml b/.github/ISSUE_TEMPLATE/sample-usecase-template.yml
index b3d8ccb..68adeae 100644
--- a/.github/ISSUE_TEMPLATE/sample-usecase-template.yml
+++ b/.github/ISSUE_TEMPLATE/sample-usecase-template.yml
@@ -21,11 +21,11 @@ body:
       value: |
         ## Motivation
   - type: textarea
-    id: what_to_be_done
+    id: Summary
     attributes:
-      label: "What to be done?"
+      label: "Summary"
       description: |
-        Please describe any problems or improvements you would like to make in your use case.
+        Please describe the summary of any problems or improvements you would like to make in your use case.
     validations:
       required: true
   - type: textarea
@@ -36,13 +36,14 @@ body:
         Please describe why you would like to use WoT in your use case.
     validations:
       required: true
-
-  - type: markdown
+  - type: textarea
+    id: gaps
     attributes:
-      value: |
-        ## Use Case Description and Expectations for stakeholders and environments
-
-
+      label: Gaps between the user's need and what's possible today
+      description: |
+        Describe any gaps that are not addressed in the current WoT standards and building blocks
+    validations:
+      required: true
   - type: textarea
     id: description
     attributes:
@@ -50,14 +51,10 @@ body:
       description: "Please describe your use case details."
     validations:
       required: true
-  - type: textarea
-    id: gaps
+  - type: markdown
     attributes:
-      label: Gaps between the user's need and what's possible today
-      description: |
-        Describe any gaps that are not addressed in the current WoT standards and building blocks
-    validations:
-      required: true
+      value: |
+        ## Use Case Description and Expectations for stakeholders and environments
   - type: dropdown
     id: targetusers
     attributes: