diff --git a/ui/views/ticket/create.html b/ui/views/ticket/create.html
index eb4d8e9..a1aadd1 100644
--- a/ui/views/ticket/create.html
+++ b/ui/views/ticket/create.html
@@ -3,14 +3,37 @@
 
 <form action="/ticket/create" method="POST">
 
-    {{ BulmaForm::horizontal_field_input('Title:', 'title') }}
-
-    {{ BulmaForm::horizontal_field_textarea('Description:', 'description') }}
+    <bulma type="H_FIELD_INPUT" label="Title:" name="title" value=""></bulma>
+    <bulma type="H_FIELD_TEXTAREA" label="Description:" name="description" value=""></bulma>
 
     {{ BulmaForm::horizontal_field_select('Priority:', 'priority', ['Low', 'Medium', 'High'])}}
-
     {{ BulmaForm::horizontal_field_select('Status:', 'status', ['New', 'In Progress', 'On Hold', 'Completed'])}}
 
+    <!-- custom fields -->
+    <hr>
+    <div class="block">
+        <div class="field is-grouped is-grouped-right">
+            <div class="control">
+                <label class="label">Key:</label>
+                <input class="input" type="text" name="meta_key[]" placeholder="eg. Department">
+            </div>
+            <div class="control">
+                <label class="label">Value:</label>
+                <input class="input" type="text" name="meta_value[]" placeholder="eg. Finance">
+            </div>
+        </div>
+        <div class="field is-grouped is-grouped-right">
+            <div class="control">
+                <label class="label">Key:</label>
+                <input class="input" type="text" name="meta_key[]" placeholder="eg. Category">
+            </div>
+            <div class="control">
+                <label class="label">Value:</label>
+                <input class="input" type="text" name="meta_value[]" placeholder="eg. Urgent">
+            </div>
+        </div>
+    </div>
+
     <div class="field is-grouped is-grouped-right">
         <div class="control">
             <a class="button is-secondary" href="/tickets">Cancel</a>
diff --git a/ui/views/ticket/edit.html b/ui/views/ticket/edit.html
index 6ec0323..096f4e5 100644
--- a/ui/views/ticket/edit.html
+++ b/ui/views/ticket/edit.html
@@ -2,14 +2,51 @@
 
 <form action="/ticket/{{ @PARAMS.id }}/update" method="POST">
 
-    {{ BulmaForm::horizontal_field_input('Title:', 'title', @ticket.title) }}
-
-    {{ BulmaForm::horizontal_field_textarea('Description:', 'description', @ticket.description) }}
+    <bulma type="H_FIELD_INPUT" label="Title:" name="title" value="{{@ticket.title}}"></bulma>
+    <bulma type="H_FIELD_TEXTAREA" label="Description:" name="description" value="{{@ticket.description}}"></bulma>
 
     {{ BulmaForm::horizontal_field_select('Priority:', 'priority', ['Low', 'Medium', 'High'])}}
-
     {{ BulmaForm::horizontal_field_select('Status:', 'status', ['New', 'In Progress', 'On Hold', 'Completed'])}}
 
-    <button class="button is-primary" type="submit">Edit Ticket</button>
+
+    <div class="block">
+        <h3 class="title is-5">Custom Fields</h3>
+        <!-- existing fields-->
+        <div class="block">
+            <repeat group="{{ @ticket_meta }}" value="{{ @m }}">
+                <div class="field is-grouped is-grouped-right">
+                    <input type="hidden" name="meta_id[]" value=" {{ @m.id }}">
+                    <div class="control">
+                        <label class="label">Key:</label>
+                        <input class="input" type="text" name="meta_key[]" value="{{ @m.meta_key }}" 
+                            placeholder="eg. Department">
+                    </div>
+                    <div class="control">
+                        <label class="label">Value:</label>
+                        <input class="input" type="text" name="meta_value[]" value="{{ @m.meta_value }}" 
+                            placeholder="eg. Finance">
+                    </div>
+                </div>
+            </repeat>
+        </div>
+        <hr>
+        <!-- adding new custom meta -->
+        <div class="block">
+            <div class="field is-grouped is-grouped-right">
+                <div class="control">
+                    <label class="label">Key:</label>
+                    <input class="input" type="text" name="new_meta_key[]"
+                        placeholder="eg. Department">
+                </div>
+                <div class="control">
+                    <label class="label">Value:</label>
+                    <input class="input" type="text" name="new_meta_value[]"
+                        placeholder="eg. Finance">
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <button class="button is-primary" type="submit">Save Ticket</button>
 </div>
 </form>
\ No newline at end of file