diff --git a/client/app/components/dynamic-form.html b/client/app/components/dynamic-form.html
index 066a6a2ec..8c9a874a4 100644
--- a/client/app/components/dynamic-form.html
+++ b/client/app/components/dynamic-form.html
@@ -23,7 +23,7 @@
                ng-if="field.property.type === 'file'">
     </div>
 
-    <button class="btn btn-primary" ng-disabled="!dataSourceForm.$valid" ng-click="saveChanges()">Save</button>
+    <button class="btn btn-block btn-primary m-b-10" ng-disabled="!dataSourceForm.$valid" ng-click="saveChanges()">Save</button>
     <span ng-repeat="action in actions">
         <button class="btn"
                 ng-class="action.class"
diff --git a/client/app/pages/data-sources/show.html b/client/app/pages/data-sources/show.html
index ec942e31a..ef96bce6f 100644
--- a/client/app/pages/data-sources/show.html
+++ b/client/app/pages/data-sources/show.html
@@ -154,60 +154,9 @@
     </div>
 
     <div class="col-md-4 col-md-offset-4">
-      <form class="form ng-pristine ng-valid-email ng-valid ng-valid-required" name="userSettingsForm" ng-submit="updateUser(userSettingsForm)" novalidate="">
-        <div class="form-group" ng-class="{ 'has-error':  (userSettingsForm.name | showError:userSettingsForm )}">
-          <label class="control-label" for="name">Name</label>
-          <input name="name" id="name" type="text" class="form-control ng-pristine ng-untouched ng-not-empty ng-valid ng-valid-required" ng-model="user.name" required="">
-          <error-messages input="userSettingsForm.name" form="userSettingsForm">
-            <div class="help-block ng-hide ng-inactive" ng-messages="$ctrl.input.$error" ng-show="$ctrl.input.$touched || $ctrl.form.$submitted">
-            </div>
-          </error-messages>
-        </div>
-
-        <div class="form-group" ng-class="{ 'has-error':  (userSettingsForm.name | showError:userSettingsForm )}">
-          <label class="control-label" for="name">Project ID</label>
-          <input name="name" id="name" type="text" class="form-control ng-pristine ng-untouched ng-not-empty ng-valid ng-valid-required" ng-model="user.name" required="">
-          <error-messages input="userSettingsForm.name" form="userSettingsForm">
-            <div class="help-block ng-hide ng-inactive" ng-messages="$ctrl.input.$error" ng-show="$ctrl.input.$touched || $ctrl.form.$submitted">
-            </div>
-          </error-messages>
-        </div>
-
-        <div class="form-group" ng-class="{ 'has-error':  (userSettingsForm.name | showError:userSettingsForm )}">
-          <label class="control-label" for="name">Scanned</label>
-          <input name="name" id="name" type="text" class="form-control ng-pristine ng-untouched ng-not-empty ng-valid ng-valid-required" ng-model="user.name" required="">
-          <error-messages input="userSettingsForm.name" form="userSettingsForm">
-            <div class="help-block ng-hide ng-inactive" ng-messages="$ctrl.input.$error" ng-show="$ctrl.input.$touched || $ctrl.form.$submitted">
-            </div>
-          </error-messages>
-        </div>
-
-        <div class="form-group" ng-class="{ 'has-error':  (userSettingsForm.name | showError:userSettingsForm )}">
-          <label class="control-label" for="name">Maximum</label>
-          <input name="name" id="name" type="text" class="form-control ng-pristine ng-untouched ng-not-empty ng-valid ng-valid-required" ng-model="user.name" required="">
-          <error-messages input="userSettingsForm.name" form="userSettingsForm">
-            <div class="help-block ng-hide ng-inactive" ng-messages="$ctrl.input.$error" ng-show="$ctrl.input.$touched || $ctrl.form.$submitted">
-            </div>
-          </error-messages>
-        </div>
-
-
-        <div class="form-group">
-          <button class="btn btn-block btn-primary">Add Data Source</button>
-        </div>
-
-        <div class="form-group ">
-          <button class="btn btn-danger">Delete</button>
-          <button class="btn btn-primary pull-right">Test Connection</button>
-        </div>
-      </form>
+      <dynamic-form target="dataSource" type="data_sources" actions="actions">
+      </dynamic-form>
     </div>
 
-
-
-    <!--<div class="col-md-8">-->
-      <!--<dynamic-form target="dataSource" type="data_sources" actions="actions">-->
-      <!--</dynamic-form>-->
-    <!--</div>-->
   </div>
 </settings-screen>
diff --git a/client/app/pages/data-sources/show.js b/client/app/pages/data-sources/show.js
index bd7e9106f..1fae90fa6 100644
--- a/client/app/pages/data-sources/show.js
+++ b/client/app/pages/data-sources/show.js
@@ -55,7 +55,7 @@ function DataSourceCtrl(
   $scope.actions = [
     { name: 'Delete', class: 'btn-danger', callback: deleteDataSource },
     {
-      name: 'Test Connection', class: 'btn-default', callback: testConnection, disableWhenDirty: true,
+      name: 'Test Connection', class: 'btn-default pull-right', callback: testConnection, disableWhenDirty: true,
     },
   ];
 }