diff --git a/static/directives/setup-trigger-dialog.html b/static/directives/setup-trigger-dialog.html
index 0cd47b23c..d3fe653bb 100644
--- a/static/directives/setup-trigger-dialog.html
+++ b/static/directives/setup-trigger-dialog.html
@@ -21,7 +21,7 @@
             </div>
             <div ng-switch-when="custom">
               <div class="trigger-setup-custom" repository="repository" trigger="trigger"
-                   next-set-counter="nextStepCounter" current-setp-valid="state.stepValid"
+                   next-step-counter="nextStepCounter" current-step-valid="state.stepValid"
                    analyze="checkAnalyze(isValid)"></div>
             </div>
           </div>
@@ -35,7 +35,7 @@
           <div class="trigger-option-section" ng-show="currentView == 'analyzed'">
 
             <!-- Messaging -->
-            <div class="alert alert-danger" ng-if="pullInfo.analysis.status == 'error'">
+            <div class="alert alert-danger" ng-if="pullInfo.analysis.status == 'error' && !(trigger.service == 'custom')">
               {{ pullInfo.analysis.message }}
             </div>
             <div class="alert alert-warning" ng-if="pullInfo.analysis.status == 'warning'">
@@ -59,7 +59,10 @@
               </div>
             </div>
 
-            <div style="margin-bottom: 12px">Please select the credentials to use when pulling the base image:</div>
+            <div style="margin-bottom: 12px">
+              <p>Because Dockerfiles may depend on other private images, you may need to use a robot account to build this repository.</p>
+              Please select the credentials to use when pulling the base image:
+            </div>
             <div ng-if="!isNamespaceAdmin(repository.namespace)" style="color: #aaa;">
               <strong>Note:</strong> In order to set pull credentials for a build trigger, you must be an
               Administrator of the namespace <strong>{{ repository.namespace }}</strong>
diff --git a/static/directives/trigger-setup-custom.html b/static/directives/trigger-setup-custom.html
index 6c200c894..633ab74ff 100644
--- a/static/directives/trigger-setup-custom.html
+++ b/static/directives/trigger-setup-custom.html
@@ -1,16 +1,39 @@
 <div class="trigger-setup-custom-element">
-  <!-- Current selected info, is this even necessary? -->
   <div class="selected-info" ng-show="nextStepCounter > 0">
+    <table style="width: 100%;">
+      <tr ng-show="nextStepCounter > 0">
+        <td width="200px">Repository</td>
+        <td>{{ state.gitURL }}</td>
+      </tr>
+
+      <tr ng-show="nextStepCounter > 1">
+        <td>Dockerfile Location:</td>
+        <td>
+          <div class="dockerfile-location">
+            <i class="fa fa-folder fa-lg"></i> {{ state.currentLocation || '(Repository Root)' }}
+          </div>
+        </td>
+    </table>
   </div>
 
   <!-- Step view -->
   <div class="step-view" next-step-counter="nextStepCounter" current-step-valid="currentStepValid"
-       steps-completed="stepsCompleted()">
+    steps-completed="stepsCompleted()">
 
-       <!-- Git URL Input -->
-       <div class="step-view-step" complete-condition="state.gitURL">
-         <div style="margin-bottom: 12px;">Please enter the URL used to clone the your git repository:</div>
-         <input type="text" ng-pattern="">
-       </div>
+    <!-- Git URL Input -->
+    <div class="step-view-step" complete-condition="state.gitURL" load-callback="nopLoad(callback)"
+         load-message="Loading Git URL Input">
+      <div style="margin-bottom: 12px;">Please enter the URL used to clone your git repository:</div>
+      <input class="form-control" type="text" placeholder="git://example.com/namespace/repository.git" style="width: 100%;"
+             ng-model="state.gitURL" ng-pattern="/(git|http|https):\/\/(.*)(\.git)/">
+    </div>
+
+    <!-- Dockerfile folder select -->
+    <div class="step-view-step" complete-condition="state.currentLocation" load-callback="nopLoad(callback)"
+         load-message="Loading Folder Input">
+       <div style="margin-bottom: 12px">Dockerfile Location:</div>
+       <input class="form-control" type="text"  placeholder="/" style="width: 100%;"
+              ng-model="state.currentLocation">
+    </div>
   </div>
 </div>
diff --git a/static/directives/trigger-setup-github.html b/static/directives/trigger-setup-github.html
index 0d6baaf74..c6af1f957 100644
--- a/static/directives/trigger-setup-github.html
+++ b/static/directives/trigger-setup-github.html
@@ -33,7 +33,7 @@
         </td>
         <td>
           <div class="dockerfile-location">
-              <i class="fa fa-folder fa-lg"></i> {{ state.currentLocation || '(Repository Root)' }}
+            <i class="fa fa-folder fa-lg"></i> {{ state.currentLocation || '(Repository Root)' }}
           </div>
         </td>
       </tr>
diff --git a/static/js/directives/ui/trigger-setup-custom.js b/static/js/directives/ui/trigger-setup-custom.js
index ddc9d9fc8..2f8ec9ffe 100644
--- a/static/js/directives/ui/trigger-setup-custom.js
+++ b/static/js/directives/ui/trigger-setup-custom.js
@@ -23,10 +23,15 @@ angular.module('quay').directive('triggerSetupCustom', function() {
 
       $scope.state = {
         'gitURL': null,
+        'subdir': null,
       };
 
       $scope.stepsCompleted = function() {
-        $scope.analyze({'isValid': $scope.state.gitURL != null});
+        $scope.analyze({'isValid': $scope.state.gitURL != null && $scope.subdir != null});
+      };
+
+      $scope.nopLoad = function(callback) {
+        callback();
       };
     }
   };