diff --git a/xos/core/xoslib/dashboards/contentProvider.html b/xos/core/xoslib/dashboards/contentProvider.html
index a86c382..24cd7f1 100644
--- a/xos/core/xoslib/dashboards/contentProvider.html
+++ b/xos/core/xoslib/dashboards/contentProvider.html
@@ -12,7 +12,7 @@
   <ng-view></ng-view>
 </div>
 
-
+<link rel="stylesheet" href="{{ STATIC_URL }}/css/xosLib.css">
 <script src="{{ STATIC_URL }}/js/vendor/angular/angular.min.js"></script>
 <script src="{{ STATIC_URL }}/js/vendor/angular-resource/angular-resource.min.js"></script>
 <script src="{{ STATIC_URL }}/js/vendor/angular-route/angular-route.min.js"></script>
diff --git a/xos/core/xoslib/static/css/xosLib.css b/xos/core/xoslib/static/css/xosLib.css
new file mode 100644
index 0000000..d2f9349
--- /dev/null
+++ b/xos/core/xoslib/static/css/xosLib.css
@@ -0,0 +1,13 @@
+/* Style helpers for xoslib*/
+
+
+/* gives an element the same spacing as it is inside a well*/
+.margin-wells {
+  margin: 12px;
+}
+
+/* if inside a form set margin-top to align with inputs instead of labels*/
+/* TODO once scss use a form like form [class^=span] > label + &[class^=span] > .margin-wells to match only if label is set*/
+form button.margin-wells {
+  margin-top: 20px;
+}
\ No newline at end of file
diff --git a/xos/core/xoslib/static/templates/contentProvider/cp_cdn_prefix.html b/xos/core/xoslib/static/templates/contentProvider/cp_cdn_prefix.html
index d989f90..7367f30 100644
--- a/xos/core/xoslib/static/templates/contentProvider/cp_cdn_prefix.html
+++ b/xos/core/xoslib/static/templates/contentProvider/cp_cdn_prefix.html
@@ -41,8 +41,8 @@
             <option ng-repeat="prf in vm.prf" ng-value="'/hpcapi/originservers/' + prf.id + '/'">{$ prf.humanReadableName $}</option>
           </select>
         </div>
-        <div class="span2">
-          <button class="btn btn-success pull-right">
+        <div class="span2 text-right">
+          <button class="btn btn-success margin-wells">
             <i class="icon icon-plus"></i>
           </button>
         </div>
diff --git a/xos/core/xoslib/static/templates/contentProvider/cp_origin_server.html b/xos/core/xoslib/static/templates/contentProvider/cp_origin_server.html
index 0dd9211..ff77864 100644
--- a/xos/core/xoslib/static/templates/contentProvider/cp_origin_server.html
+++ b/xos/core/xoslib/static/templates/contentProvider/cp_origin_server.html
@@ -39,8 +39,8 @@
           <label>Url</label>
           <input type="text" ng-model="vm.new_os.url" required>
         </div>
-        <div class="span2">
-          <button class="btn btn-success pull-right">
+        <div class="span2 text-right">
+          <button class="btn btn-success margin-wells">
             <i class="icon icon-plus"></i>
           </button>
         </div>
diff --git a/xos/core/xoslib/static/templates/contentProvider/cp_user.html b/xos/core/xoslib/static/templates/contentProvider/cp_user.html
index 0d08984..a8d12f6 100644
--- a/xos/core/xoslib/static/templates/contentProvider/cp_user.html
+++ b/xos/core/xoslib/static/templates/contentProvider/cp_user.html
@@ -34,10 +34,11 @@
     <form ng-submit="vm.saveContentProvider(vm.cp)">
       <div class="row-fluid">
         <div class="span8">
+          <label>Select user:</label>
           <select ng-model="vm.user" ng-options="u as u.username for u in vm.users" ng-change="vm.addUserToCp(vm.user)"></select>
         </div>  
         <div class="span4 text-right">
-          <button class="btn btn-success" disabled="disabled">
+          <button class="btn btn-success margin-wells" disabled="disabled">
             Save
           </button>
         </div>