diff --git a/index.html b/index.html
index 63b4c11..318f3d2 100644
--- a/index.html
+++ b/index.html
@@ -97,8 +97,8 @@
           <h5>{{title}}</h5>
           <div class="card-details">
             <p data-field="description">{{description}}</p>
-            <p data-field="remote_url"><a href="{{remote_url}}" target="_blank">{{remote_url}}</a></p>
-            <p data-field="assigned_to">{{assigned_to}}</p>
+            <p data-field="remote_url"><a href="{{#checkForBlank remote_url}}{{/checkForBlank}}" target="_blank">{{#checkForBlank remote_url}}{{/checkForBlank}}</a></p>
+            <p data-field="assigned_to">{{#checkForBlank assigned_to}}{{/checkForBlank}}</p>
           </div>
         </div>
       {{/each}}
@@ -107,6 +107,7 @@
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
     <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"></script>
     <script src="app/assets/scripts/lib/handlebars-v4.0.5.js"></script>
+    <script src="app/assets/scripts/helper.js"></script>
     <script src="app/assets/scripts/localstorage.js"></script>
     <script src="app/assets/scripts/app.js"></script>
   </body>
diff --git a/src/scripts/app.js b/src/scripts/app.js
index 6ec24f3..d3c2cb7 100644
--- a/src/scripts/app.js
+++ b/src/scripts/app.js
@@ -52,6 +52,11 @@ var App = function() {
           obj[keyVal[0]] = unescape(keyVal[1]);
         }
         
+        // TODO: Add validations
+        if(obj.description === '' || obj.title === '') {
+          return;
+        }
+        
         var iid = LocalStorage.get('taskCounter');
         obj.id = ++iid;
         obj.status = 'pending';
@@ -63,6 +68,9 @@ var App = function() {
         draggable();
         
         $('.close-modal').trigger('click');
+        
+        //Clear form fields after submit
+        $(this).find('input[type=text], textarea').val('');
       });
       
     });
diff --git a/src/scripts/helper.js b/src/scripts/helper.js
new file mode 100644
index 0000000..6211a00
--- /dev/null
+++ b/src/scripts/helper.js
@@ -0,0 +1,3 @@
+Handlebars.registerHelper('checkForBlank', function(val, options) {
+  return (val !== '') ? val : '-';
+});
\ No newline at end of file