diff --git a/app/assets/javascripts/app/activity/cashOuts/new.html b/app/assets/javascripts/app/activity/cashOuts/new.html
index 5852bc46a..362968f9a 100644
--- a/app/assets/javascripts/app/activity/cashOuts/new.html
+++ b/app/assets/javascripts/app/activity/cashOuts/new.html
@@ -2,13 +2,13 @@
   <ul class="breadcrumb">
     <li><a href="/">Home</a></li>
     <li><a href="/activity">Activity</a></li>
-    <li class="active"><a href="/activity/account">Account</a></li>
+    <li><a href="/activity/account">Account</a></li>
   </ul>
 
   <ng-include src="'app/activity/templates/navTabs.html'"></ng-include>
 
   <div ng-show="sources.length == 0">
-    <div>
+    <div class="alert alert-danger">
       <h3 style="margin-top: 0">Invalid Cash Out Request</h3>
       <p>You do not have any eligible cash outs. If you think this is a mistake, please email <a href="mailto:support@bountysource.com">support@bountysource.com</a></p>
     </div>
@@ -137,7 +137,7 @@ <h3 style="margin-top: 0">Invalid Cash Out Request</h3>
       </div>
 
       <!-- Payment method -->
-      <div class="form-group" ng-controller="NewCashOutPaymentMethodController" ng-if=false>
+      <div class="form-group" ng-controller="NewCashOutPaymentMethodController">
         <label class="control-label col-sm-3">Payment Method</label>
         <div class="col-sm-9">
 
@@ -158,9 +158,7 @@ <h3 style="margin-top: 0">Invalid Cash Out Request</h3>
               <div class="col-sm-12">
                 <div class="radio">
                   <label>
-                    <input type="radio" ng-model="cashOut.type" ng-value="'bitcoin'" ng-disabled="!BS_ENV.coinbase_enabled" />
-                    <span ng-if="BS_ENV.coinbase_enabled">Bitcoin</span>
-                    <span ng-if="!BS_ENV.coinbase_enabled" style="color: #888">Bitcoin (temporarily disabled)</span>
+                    <input type="radio" ng-model="cashOut.type" ng-value="'bitcoin'" /> Bitcoin
                   </label>
                 </div>
               </div>
diff --git a/app/assets/javascripts/app/activity/cashOuts/new.js b/app/assets/javascripts/app/activity/cashOuts/new.js
index d75f45e51..ca4e20d91 100644
--- a/app/assets/javascripts/app/activity/cashOuts/new.js
+++ b/app/assets/javascripts/app/activity/cashOuts/new.js
@@ -47,7 +47,7 @@ angular.module('activity').
     $scope.activeTemplate = $scope.templates[$scope.activeTemplateIndex];
 
     $scope.cashOut = {
-      type: 'paypal',
+      type: undefined,
       amount: undefined,
       paypal_address: undefined,
       bitcoin_address: undefined,
diff --git a/app/assets/javascripts/app/cart/cart.html.erb b/app/assets/javascripts/app/cart/cart.html.erb
index 71cfc47e8..3af387716 100644
--- a/app/assets/javascripts/app/cart/cart.html.erb
+++ b/app/assets/javascripts/app/cart/cart.html.erb
@@ -2,11 +2,11 @@
 
   <ul class="breadcrumb">
     <li><a href="/">Home</a></li>
-    <li class="active"><a>Shopping Cart</a></li>
+    <li><a>Shopping Cart</a></li>
   </ul>
 
   <div class="row" ng-hide="hide_cart">
-    <div class="col-md-8 col-xs-12">
+    <div class="col-md-9 col-sm-8">
 
       <div ng-if="cart.isEmpty()">
         <h1>Your shopping cart is empty.</h1>
@@ -18,86 +18,75 @@
       </div>
 
       <div class="panel panel-green panel-green-background ng-scope">
-        <div class="panel-body">
+        <div class="panel-body text-center">
           <h4>
             <span style="margin-right:10px">Please also consider a contribution to the <a href="https://salt.bountysource.com/teams/bountysource" target="_blank">Bountysource Team</a>:</span>
-          </h4>
-          <div>
             <span>
-              <a class="btn btn-aquamarine btn-small-radius ng-binding" ng-click="donateToBountysource(5)">$5</a>
-              <a class="btn btn-aquamarine btn-small-radius ng-binding" ng-click="donateToBountysource(15)">$15</a>
-              <a class="btn btn-aquamarine btn-small-radius ng-binding" ng-click="donateToBountysource(50)">$50</a>
-              <a class="btn btn-aquamarine btn-small-radius ng-binding" ng-click="donateToBountysource()">Other</a>
+              <a class="btn btn-success ng-binding" ng-click="donateToBountysource(5)">$5</a>
+              <a class="btn btn-success ng-binding" ng-click="donateToBountysource(15)">$15</a>
+              <a class="btn btn-success ng-binding" ng-click="donateToBountysource(50)">$50</a>
+              <a class="btn btn-success ng-binding" ng-click="donateToBountysource()">Other</a>
             </span>
-          </div>
+          </h4>
         </div>
       </div>
 
-      <div ng-if="cart && !cart.isEmpty() ">
-        <div ng-repeat="item in cart.items" class="row display-flex vertical-align-middle bb-1 pt-3 pb-3">
+      <table class="table" ng-if="cart && !cart.isEmpty()">
+        <tbody>
+        <tr ng-repeat="item in cart.items">
           <!-- Item image -->
-          <div class="col-md-1 col-sm-1 hidden-xs">
+          <td class="col-md-1 col-sm-1 hidden-xs">
             <!-- Bounty -->
             <a ng-if="isBounty(item)" ng-href="/trackers/{{item.issue.tracker.slug}}">
-              <img class="img-responsive img-circle" ng-src="{{item.issue.tracker.image_url_medium}}" />
+              <img class="img-responsive" ng-src="{{item.issue.tracker.image_url_medium}}" />
             </a>
 
             <!-- Pledge -->
             <a ng-if="isPledge(item)" ng-href="/fundraisers/{{item.fundraiser.slug}}">
-              <img class="img-responsive img-circle" ng-src="{{item.fundraiser.image_url_medium}}" />
+              <img class="img-responsive" ng-src="{{item.fundraiser.image_url_medium}}" />
             </a>
 
             <!-- TeamPayin -->
             <a ng-if="isTeamPayin(item)" ng-href="/teams/{{item.team.slug}}">
-              <img class="img-responsive img-circle" ng-src="{{item.team.image_url_medium}}" />
+              <img class="img-responsive" ng-src="{{item.team.image_url_medium}}" />
             </a>
 
             <!-- Proposal -->
             <a ng-if="isProposal(item)" ng-href="/issues/{{item.issue.slug}}">
-              <img class="img-responsive img-circle" ng-src="{{ item.issue.tracker.image_url_medium }}" />
+              <img ng-src="{{ item.issue.tracker.image_url_medium }}" class="img-responsive" />
             </a>
 
             <!-- Issue Suggestion Reward -->
             <a ng-if="isIssueSuggestionReward(item)" ng-href="/people/{{item.suggestion.person.slug}}">
-              <img class="img-responsive img-circle" ng-src="{{ item.suggestion.person.image_url_medium }}" />
+              <img ng-src="{{ item.suggestion.person.image_url_medium }}" class="img-responsive" />
             </a>
-          </div>
+          </td>
 
           <!-- Item attributes -->
-          <div class="col-sm-7 col-xs-12">
+          <td class="col-md-9 col-sm-8 col-xs-8">
 
             <!-- Title -->
             <div>
-              <span ng-if="isBounty(item)">
-                Bounty for <a ng-href="/issues/{{item.issue.slug}}">{{item.issue.title}}</a>
-              </span>
-              <span ng-if="isPledge(item)">
-                Pledge to <a ng-href="/fundraisers/{{item.fundraiser.slug}}">{{item.fundraiser.title}}</a>
-              </span>
-              <span ng-if="isTeamPayin(item)">
-                Contribution to <a ng-href="/teams/{{item.team.slug}}">{{item.team.name}}</a>
-              </span>
-              <span ng-if="isProposal(item)">
-                Proposal for <a ng-href="/issues/{{item.issue.slug}}">{{ item.issue.title }}</a>
-              </span>
-              <span ng-if="isIssueSuggestionReward(item)">
-                Issue Suggestion Reward to <a ng-href="/people/{{item.suggestion.person.slug}}">{{ item.suggestion.person.display_name }}</a> for <a ng-href="/issues/{{item.suggestion.issue.slug}}">{{ item.suggestion.issue.title }}</a>
-              </span>
+              <h4 ng-if="isBounty(item)" style="margin-top: 0;">Bounty for <a ng-href="/issues/{{item.issue.slug}}">{{item.issue.title}}</a></h4>
+              <h4 ng-if="isPledge(item)" style="margin-top: 0;">Pledge to <a ng-href="/fundraisers/{{item.fundraiser.slug}}">{{item.fundraiser.title}}</a></h4>
+              <h4 ng-if="isTeamPayin(item)" style="margin-top: 0;">Contribution to <a ng-href="/teams/{{item.team.slug}}">{{item.team.name}}</a></h4>
+              <h4 ng-if="isProposal(item)" style="margin-top: 0;">Proposal for <a ng-href="/issues/{{item.issue.slug}}">{{ item.issue.title }}</a></h4>
+              <h4 ng-if="isIssueSuggestionReward(item)" style="margin-top: 0;">Issue Suggestion Reward to <a ng-href="/people/{{item.suggestion.person.slug}}">{{ item.suggestion.person.display_name }}</a> for <a ng-href="/issues/{{item.suggestion.issue.slug}}">{{ item.suggestion.issue.title }}</a></h4>
             </div>
 
             <ng-form class="form-horizontal" name="cartForm">
 
               <!-- Owner select -->
-              <div ng-if="current_person && !isProposal(item) && !isIssueSuggestionReward(item)" class="form-group mt-3">
-                <span class="col-md-3 col-sm-4 col-xs-5 text-muted"><small>Display As</small></span>
+              <div ng-if="current_person && !isProposal(item) && !isIssueSuggestionReward(item)" class="form-group">
+                <label class="control-label col-md-3 col-sm-4 col-xs-5"><small>Display As:</small></label>
 
                 <div class="col-md-9 col-sm-8 col-xs-7">
-                  <button class="btn btn-default btn-sm btn-small-radius dropdown-toggle" data-toggle="dropdown">
+                  <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
                     <!-- Owner image -->
-                    <img ng-show="item.owner" style="height: 17px; width: 17px; display: inline;" ng-src="{{item.owner.image_url_small || item.owner.image_url}}" class="img-circle"/>
+                    <img ng-show="item.owner" style="height: 17px; width: 17px; display: inline;" ng-src="{{item.owner.image_url_small || item.owner.image_url}}" />
 
                     <!-- Owner image if owner is missing -->
-                    <img ng-hide="item.owner" style="height: 17px; width: 17px; display: inline;" src='<%= asset_path("anon.jpg") %>' class="img-circle" />
+                    <img ng-hide="item.owner" style="height: 17px; width: 17px; display: inline;" src='<%= asset_path("anon.jpg") %>' />
 
                     <span>{{item.owner.display_name || item.owner.name || 'Anonymous'}}</span>
                     <span class="caret"></span>
@@ -107,7 +96,7 @@
                     <!-- Current person, if logged in -->
                     <li ng-if="current_person">
                       <a ng-click="setOwner($index, 'person', current_person)">
-                        <img ng-src="{{current_person.image_url_small || current_person.image_url}}" style="height: 18px; width: 18px; display: inline;" class="img-circle"/>
+                        <img ng-src="{{current_person.image_url_small || current_person.image_url}}" style="height: 18px; width: 18px; display: inline;" />
                         {{current_person.display_name}}
                       </a>
                     </li>
@@ -125,7 +114,7 @@
                     <li ng-if="teams.length > 0" class="dropdown-header">Your Teams</li>
                     <li>
                       <a ng-repeat="team in teams | orderBy:'-activity_total'" ng-click="setOwner($parent.$index, 'team', team)">
-                        <img ng-src="{{team.image_url_small || team.image_url}}" style="height: 18px; width: 18px; display: inline;" class="img-circle"/>
+                        <img ng-src="{{team.image_url_small || team.image_url}}" style="height: 18px; width: 18px; display: inline;" />
                         {{team.name}}
                       </a>
                     </li>
@@ -137,7 +126,7 @@
               <div ng-if="isProposal(item)">
                 <!-- Developer -->
                 <div class="form-group">
-                  <span class="col-xs-5 col-sm-4 col-md-3 text-muted"><small>Developer</small></span>
+                  <label class="control-label col-xs-5 col-sm-4 col-md-3"><small>Developer:</small></label>
                   <div class="col-xs-7 col-sm-8 col-md-9">
                     <p class="form-control-static">
                       <a ng-href="people/{{ item.person.slug }}">{{ item.person.display_name }}</a>
@@ -147,7 +136,7 @@
 
                 <!-- Estimated Completion -->
                 <div class="form-group">
-                  <span class="col-xs-5 col-sm-4 col-md-3 text-muted"><small>Completed By</small></span>
+                  <label class="control-label col-xs-5 col-sm-4 col-md-3"><small>Completed By:</small></label>
                   <div class="col-xs-7 col-sm-8 col-md-9">
                     <p class="form-control-static">{{ item.completed_by | date:'mediumDate' }}</p>
                   </div>
@@ -155,7 +144,7 @@
 
                 <!-- Abstract -->
                 <div class="form-group">
-                  <span class="col-xs-5 col-sm-4 col-md-3 text-muted"><small>Notes</small></span>
+                  <label class="control-label col-xs-5 col-sm-4 col-md-3"><small>Notes:</small></label>
                   <div class="col-xs-7 col-sm-8 col-md-9"><p class="form-control-static">{{ item.bio }}</p></div>
                 </div>
               </div>
@@ -163,7 +152,7 @@
               <div ng-if="isBounty(item)">
                 <!-- Expires -->
                 <div class="form-group" ng-class="{ 'has-error': !bountyExpirationValid(item) }">
-                  <span class="col-md-3 col-sm-4 col-xs-5 text-muted"><small>Expires</small></span>
+                  <label class="control-label col-md-3 col-sm-4 col-xs-5"><small>Expires:</small></label>
 
                   <div class="col-md-4 col-sm-8 col-xs-7">
                     <select class="form-control input-sm"
@@ -182,7 +171,7 @@
 
                 <!-- After expiration select -->
                 <div class="form-group" ng-if="item.bounty_expiration && item.bounty_expiration !== 'never'" ng-class="{ 'has-error': cartForm.expireSelect.$invalid }">
-                  <span class="col-md-3 col-sm-4 col-xs-5 text-muted"><small>Upon Expiration</small></span>
+                  <label class="col-md-3 col-sm-4 col-xs-5 control-label"><small>Upon Expiration:</small></label>
 
                   <div class="col-md-9 col-sm-8 col-xs-7">
                     <select class="form-control input-sm"
@@ -213,7 +202,7 @@
 
                 <!-- Reward select -->
                 <div class="form-group" ng-class="{ 'has-error': (item.reward && !pledgeRewardValid(item)) }">
-                  <psan class="col-md-3 col-sm-4 col-xs-5 text-muted"><small>Reward</small></psan>
+                  <label class="control-label col-md-3 col-sm-4 col-xs-5"><small>Reward:</small></label>
                   <div class="col-md-7 col-sm-6 col-xs-7">
                     <select class="form-control input-sm"
                             ng-model="item.reward_id"
@@ -231,7 +220,7 @@
                 <!-- Reward survey response -->
                 <div ng-if="item.reward.fulfillment_details">
                   <div class="form-group" ng-class="{ 'has-error': cartForm.surveyResponse.$invalid }">
-                    <span class="col-md-3 col-sm-4 col-xs-5 text-muted"><small>Reward Details</small></span>
+                    <label class="control-label col-md-3 col-sm-4 col-xs-5"><small>Reward Details:</small></label>
                     <div class="col-md-9 col-sm-8 col-xs-7">
                       <!-- Fulfillment details -->
                       <p class="form-control-static">{{item.reward.fulfillment_details}}</p>
@@ -249,11 +238,11 @@
                 </div>
               </div>
             </ng-form>
-          </div>
+          </td>
 
-          <!-- Amount -->
-          <div class="col-sm-2 col-xs-8">
-            <div class="form-group m-0" ng-class="{ 'has-error': !itemValid(item) }" >
+          <!-- Amount, delete button -->
+          <td class="col-md-3 col-sm-4 col-xs-4">
+            <div class="form-group" ng-class="{ 'has-error': !itemValid(item) }" >
               <div class="input-group" tooltip-placement="bottom" tooltip="{{5 | dollars}} minimum" ng-if="!isProposal(item)">
                 <span class="input-group-addon">
                   <currency-unit></currency-unit>
@@ -264,82 +253,82 @@
                 <p class="form-control-static"><strong>{{ item.amount | dollars }}</strong></p>
               </div>
             </div>
-          </div>
 
-          <!-- Delete button -->
-
-          <div class="col-sm-1 col-xs-4">
             <div class="text-right">
-              <button class="btn btn-default btn-small-radius" ng-click="removeItem($index)" style="width: 42px; height: 42px;">
-                <%= image_tag 'icons/icon_trash.svg', class: 'img-responsive' %>
-              </button>
+              <button class="btn btn-link" ng-click="removeItem($index)">Delete</button>
             </div>
-          </div>
-        </div>
+          </td>
+        </tr>
 
-        <div>
-          <div colspan="4" class="text-right">
+        <tr>
+          <td colspan="3" class="text-right">
             <div>
               <h4>Total: {{ calculateCartTotal() || 0 | dollars:{ precision: {'USD': 2} } }}</h4>
             </div>
-          </div>
-        </div>
-      </div>
+          </td>
+        </tr>
+        </tbody>
+      </table>
     </div>
 
     <!-- Checkout button -->
-    <div class="col-md-offset-1 col-md-3 col-xs-12 ba-1" ng-hide="!cart || cart.isEmpty()">
-      <div class="text-center pt-5">Select payment method</div>
-      <ng-form>
-        <!-- PayPal -->
-        <div class="mt-3">
-          <label>
-            <input type="radio" ng-model="checkoutPayload.checkout_method" value="paypal">
-            <favicon style="width: 16px; height: 16px;" domain="https://www.paypal.com/"></favicon>
-            <span>PayPal</span>
-          </label>
-        </div>
+    <div class="col-md-3 col-sm-4" ng-hide="!cart || cart.isEmpty()">
+      <div class="panel panel-success">
+        <div class="panel-heading text-center">Total ({{cart.items.length | number}} <ng-pluralize count="cart.items.length" when="{ '1': 'item', 'other': 'items' }"></ng-pluralize>): {{ calculateCartTotal() || 0 | dollars:{ precision: {'USD': 2} } }}</div>
 
-        <!-- Coinbase! -->
-        <div class="mt-2">
-          <label>
-            <input type="radio" ng-model="checkoutPayload.checkout_method" value="coinbase" ng-disabled="!BS_ENV.coinbase_enabled">
-            <favicon style="width: 16px; height: 16px;" domain="https://bitcoin.org/en/"></favicon>
-            <span ng-if="BS_ENV.coinbase_enabled">Bitcoin</span>
-            <span ng-if="!BS_ENV.coinbase_enabled" style="color: #888">Bitcoin (temporarily disabled)</span>
-          </label>
-        </div>
+        <div class="panel-body">
+          <div>Select Payment Method:</div>
+          <ng-form>
+            <!-- PayPal -->
+            <div class="radio">
+              <label>
+                <input type="radio" ng-model="checkoutPayload.checkout_method" value="paypal">
+                <favicon style="width: 16px; height: 16px;" domain="https://www.paypal.com/"></favicon>
+                <span>PayPal</span>
+              </label>
+            </div>
 
-        <!-- Personal Account -->
-        <div class="mt-2" ng-if="current_person.account.balance > 0">
-          <label>
-            <input type="radio" ng-model="checkoutPayload.checkout_method" value="personal" ng-disabled="current_person.account.balance < calculateCartTotal()" ng-click="setAllOwners('person', current_person)">
-            <img style="width: 16px; height: 16px;" ng-src="{{current_person.image_url}}" />
+            <!-- Coinbase! -->
+            <div class="radio">
+              <label>
+                <input type="radio" ng-model="checkoutPayload.checkout_method" value="coinbase">
+                <favicon style="width: 16px; height: 16px;" domain="https://bitcoin.org/en/"></favicon>
+                <span>Bitcoin (cash)</span>
+              </label>
+            </div>
 
-            <span ng-class="{ 'text-muted': current_person.account.balance < calculateCartTotal() }">{{current_person.display_name}} <strong>{{current_person.account.balance | dollars}}</strong></span>
-          </label>
-        </div>
+            <!-- Personal Account -->
+            <div class="radio" ng-if="current_person.account.balance > 0">
+              <label>
+                <input type="radio" ng-model="checkoutPayload.checkout_method" value="personal" ng-disabled="current_person.account.balance < calculateCartTotal()" ng-click="setAllOwners('person', current_person)">
+                <img style="width: 16px; height: 16px;" ng-src="{{current_person.image_url}}" />
+
+                <span ng-class="{ 'text-muted': current_person.account.balance < calculateCartTotal() }">{{current_person.display_name}} <strong>{{current_person.account.balance | dollars}}</strong></span>
+              </label>
+            </div>
 
-        <!-- Team accounts -->
-        <div class="mt-2" ng-repeat="team in teams | orderBy:['-is_developer', '-account_balance']" ng-if="team.account_balance>0">
-          <label>
-            <input type="radio" ng-model="$parent.checkoutPayload.checkout_method" value="team/{{team.id}}" ng-disabled="team.account_balance < calculateCartTotal() || !team.is_developer || team.account_balance <= 0 || onTeamPage(team)"  ng-click="setAllOwners('team', team)"/>
-            <img style="width: 16px; height: 16px;" ng-src="{{team.image_url}}" />
+            <!-- Team accounts -->
+            <div class="radio" ng-repeat="team in teams | orderBy:['-is_developer', '-account_balance']" ng-if="team.account_balance>0">
+              <label>
+                <input type="radio" ng-model="$parent.checkoutPayload.checkout_method" value="team/{{team.id}}" ng-disabled="team.account_balance < calculateCartTotal() || !team.is_developer || team.account_balance <= 0 || onTeamPage(team)"  ng-click="setAllOwners('team', team)"/>
+                <img style="width: 16px; height: 16px;" ng-src="{{team.image_url}}" />
 
-            <span ng-class="{ 'text-muted': (team.account_balance < calculateCartTotal() || !team.is_developer || team.account_balance <= 0 || onTeamPage(team)) }">{{team.name}}</span>
+                <span ng-class="{ 'text-muted': (team.account_balance < calculateCartTotal() || !team.is_developer || team.account_balance <= 0 || onTeamPage(team)) }">{{team.name}}</span>
 
-            <strong ng-show="team.is_developer" ng-class="{ 'text-muted': (team.account_balance < calculateCartTotal()) }">{{team.account_balance | dollars}}</strong>
-            <strong ng-hide="team.is_developer" ng-class="{ 'text-muted': (team.account_balance < calculateCartTotal()) }">{{0 | dollars}}</strong>
-            <span ng-show="team.is_admin && team.account_balance < 100"></span>
-          </label>
+                <strong ng-show="team.is_developer" ng-class="{ 'text-muted': (team.account_balance < calculateCartTotal()) }">{{team.account_balance | dollars}}</strong>
+                <strong ng-hide="team.is_developer" ng-class="{ 'text-muted': (team.account_balance < calculateCartTotal()) }">{{0 | dollars}}</strong>
+                <span ng-show="team.is_admin && team.account_balance < 100"></span>
+              </label>
+            </div>
+          </ng-form>
         </div>
-      </ng-form>
-      <div class="panel panel-cool-grey mt-4 mb-0" style="margin-left: -15px; margin-right: -15px;">
-        <div class="panel-heading text-center">Total ({{cart.items.length | number}} <ng-pluralize count="cart.items.length" when="{ '1': 'item', 'other': 'items' }"></ng-pluralize>): {{ calculateCartTotal() || 0 | dollars:{ precision: {'USD': 2} } }}</div>
 
-        <div class="panel-body">
-          <button class="btn btn-light-blue btn-long center-block" ng-disabled="!canCheckout()" ng-click="checkout()">Checkout</button>
-        </div> 
+        <div class="panel-footer">
+          <button class="btn btn-block btn-lg btn-success" ng-disabled="!canCheckout()" ng-click="checkout()">
+            <span>Checkout</span>
+            <i class="glyphicon glyphicon-chevron-right"></i>
+          </button>
+        </div>
       </div>
     </div>
   </div>
diff --git a/app/assets/javascripts/salt/teams/admin/updates/index.html b/app/assets/javascripts/salt/teams/admin/updates/index.html
index 61da4b930..7b58c0b8f 100644
--- a/app/assets/javascripts/salt/teams/admin/updates/index.html
+++ b/app/assets/javascripts/salt/teams/admin/updates/index.html
@@ -1,11 +1,11 @@
 <h2>Community Updates</h2>
 
-<div>
+<div class="alert alert-info">
   <p>We recommend sending an update once a month. Include any accomplishments from the previous month as well as goals for the coming month.</p>
-  <p><button class="btn btn-light-blue btn-rounded btn-lg btn-long mt-3" ui-sref="root.teams.admin.updates.new({ slug: team.slug })">Email Your Community</button></p>
+  <p><button class="btn btn-primary" ui-sref="root.teams.admin.updates.new({ slug: team.slug })">Email Your Community</button></p>
 </div>
 
-<table ng-show="updates.length > 0" class="table mt-5">
+<table ng-show="updates.length > 0" class="table">
   <thead>
     <tr>
       <th>Published</th>
diff --git a/app/assets/javascripts/salt/teams/admin/updates/new.html b/app/assets/javascripts/salt/teams/admin/updates/new.html
index 19fd5824d..7b0f4a034 100644
--- a/app/assets/javascripts/salt/teams/admin/updates/new.html
+++ b/app/assets/javascripts/salt/teams/admin/updates/new.html
@@ -1,18 +1,18 @@
-<h3>Email Your Community</h3>
+<h2>Email Your Community</h2>
 <p>Sending updates on a monthly basis is a great way to keep your community engaged.</p>
 
 <form name="form" style="margin-top:30px">
   <div class="alert alert-danger" ng-show="error">{{error}}</div>
 
-  <p>Email Lists</p>
+  <div><strong>Email Lists</strong></div>
   <div class="checkbox">
-    <label class="control-label">
+    <label>
       <input type="checkbox" name="mailing_lists[]" ng-checked="form_data.mailing_lists.indexOf('bountysource') > -1" ng-click="toggle_mailing_list(form, 'bountysource')">
       {{team.name}} users on Bountysource <span ng-show="mailing_lists.bountysource_users > 0">({{mailing_lists.bountysource_users | number}})</span>
     </label>
   </div>
   <div class="checkbox" ng-show="team.can_email_stargazers">
-    <label class="control-label">
+    <label>
       <input type="checkbox" name="mailing_lists[]" ng-checked="form_data.mailing_lists.indexOf('github') > -1" ng-click="toggle_mailing_list(form, 'github')">
       {{team.name}} users on GitHub <span ng-show="mailing_lists.github_users > 0">({{mailing_lists.github_users | number}})</span>
     </label>
@@ -27,23 +27,23 @@ <h4>Emailing Users on GitHub</h4>
   <div class="form-group">
     <div class="row">
       <div class="col-md-6">
-        <label class="control-label" for="title">Subject</label>
-        <input type="text" class="form-control input-medium" id="title" ng-model="form_data.title" placeholder="Title (also used for email subject)" />
+        <label for="title">Subject</label>
+        <input type="text" class="form-control" id="title" ng-model="form_data.title" placeholder="Title (also used for email subject)" />
       </div>
     </div>
   </div>
   <div class="form-group">
     <div class="row">
       <div ng-class="{ 'col-md-12': !markdown_side_by_side, 'col-md-6': markdown_side_by_side }">
-        <label class="control-label" for="body_markdown">Body Markdown</label>
-        <textarea msd-elastic class="form-control input-medium" id="body_markdown" ng-model="form_data.body" placeholder="In June, we accomplished... In July, we hope to accompish..." style="min-height:100px"></textarea>
+        <label for="body_markdown">Body Markdown</label>
+        <textarea msd-elastic class="form-control" id="body_markdown" ng-model="form_data.body" placeholder="In June, we accomplished... In July, we hope to accompish..." style="min-height:100px"></textarea>
       </div>
       <div ng-class="{ 'col-md-12': !markdown_side_by_side, 'col-md-6': markdown_side_by_side, 'markdown-top-margin': !markdown_side_by_side }">
         <a class="pull-right" ng-click="markdown_side_by_side=!markdown_side_by_side">
           <span class="glyphicon glyphicon-resize-small" ng-show="!markdown_side_by_side"></span>
           <span class="glyphicon glyphicon-resize-full" ng-show="markdown_side_by_side"></span>
         </a>
-        <label class="control-label">Preview</label>
+        <label>Preview</label>
         <target-blank model="markdown_preview">
           <div btf-markdown="markdown_preview" class="well markdown markdown-small-headers" style="min-height:100px; margin-bottom: 0"></div>
         </target-blank>
@@ -52,13 +52,13 @@ <h4>Emailing Users on GitHub</h4>
   </div>
 
   <div class="form-group">
-    <button type="submit" class="btn btn-success btn-rounded btn-long" ng-disabled="saving_form || form.$pristine || !form_data.title || !form_data.body" ng-click="submit_form(form, {})">
+    <button type="submit" class="btn btn-success" ng-disabled="saving_form || form.$pristine || !form_data.title || !form_data.body" ng-click="submit_form(form, {})">
       <span ng-show="saving_form">Saving...</span>
       <span ng-show="!saving_form && form.$pristine">Saved</span>
       <span ng-show="!saving_form && !form.$pristine">Save Draft</span>
     </button>
-    <button type="submit" class="btn btn-light-blue btn-rounded btn-long" ng-disabled="saving_form || !form_data.title || !form_data.body" ng-click="submit_form(form, { email_me: true })">Test Email to Just Me</button>
-    <button type="submit" class="btn btn-danger btn-rounded btn-long" ng-disabled="saving_form || !form_data.title || !form_data.body" ng-click="submit_form(form, { publish: true })">Publish to Everyone</button>
+    <button type="submit" class="btn btn-primary" ng-disabled="saving_form || !form_data.title || !form_data.body" ng-click="submit_form(form, { email_me: true })">Test Email to Just Me</button>
+    <button type="submit" class="btn btn-danger" ng-disabled="saving_form || !form_data.title || !form_data.body" ng-click="submit_form(form, { publish: true })">Publish to Everyone</button>
 
   </div>
 
diff --git a/app/controllers/api/v2/cart_controller.rb b/app/controllers/api/v2/cart_controller.rb
index a121c25e5..8d0063637 100644
--- a/app/controllers/api/v2/cart_controller.rb
+++ b/app/controllers/api/v2/cart_controller.rb
@@ -53,8 +53,6 @@ def checkout
 
     # Render the JSON to trigger a Coinbase payment modal
     elsif @checkout_method.is_a?(Account::Coinbase)
-      raise "Coinbase is disabled" if ENV['COINBASE_DISABLED']
-
       options = {
         cancel_url: params[:cancel_url],
         currency: params[:currency] || 'USD'
diff --git a/app/controllers/api/v2/cash_outs_controller.rb b/app/controllers/api/v2/cash_outs_controller.rb
index 280c7f2e1..9a747bf55 100644
--- a/app/controllers/api/v2/cash_outs_controller.rb
+++ b/app/controllers/api/v2/cash_outs_controller.rb
@@ -20,9 +20,6 @@ def show
   end
 
   def create
-    raise "Coinbase is disabled" if params[:bitcoin_address] && ENV['COINBASE_DISABLED']
-    raise "Checks are disabled" if params[:mailing_address_id]
-
     if team_id = params[:source].try(:match, /\Ateam(\d+)\Z/).try(:[], 1)
       account = current_user.team_member_relations.where(admin: true, team_id: team_id).first.try(:team).try(:account)
     else
diff --git a/app/views/layouts/_env.html.erb b/app/views/layouts/_env.html.erb
index 29fe6d509..2bbde9ac2 100644
--- a/app/views/layouts/_env.html.erb
+++ b/app/views/layouts/_env.html.erb
@@ -11,7 +11,6 @@
     stripe_key: '<%=ENV['STRIPE_PUBLIC_KEY']%>',
     stripe_image: 'https://s3.amazonaws.com/stripe-uploads/acct_15jcQ4LM04M7PZLcmerchant-icon-1427143578024-Bountysource-square-100.png',
     bountysource_grey_image: '<%=asset_path("bountysource-grey.png")%>',
-    bountysource_anon_image: '<%=asset_path("anon.jpg")%>',
-    coinbase_enabled: <%=!ENV['COINBASE_DISABLED']%>
+    bountysource_anon_image: '<%=asset_path("anon.jpg")%>'
   };
 </script>
diff --git a/config/application.rb b/config/application.rb
index ffb5309f3..f625e283b 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -12,6 +12,7 @@
 module Api
   class Application < Rails::Application
 
+
     # All times should be in UTC
     ENV['TZ'] = 'UTC'
     config.time_zone = 'UTC'
@@ -124,7 +125,9 @@ class Application < Rails::Application
       api_key: ENV['COINBASE_API_KEY'],
       api_secret: ENV['COINBASE_API_SECRET'],
       callback_url: "#{config.api_url}payments/coinbase/callback"
-    }
+    } 
+    ENV['COINBASE_DISABLED'] = 'true'
+    config.coinbase_enabled = !ENV['COINBASE_DISABLED']
 
     # GitHub App
     config.github_api = {