diff --git a/mozillians/static/mozillians/css/main.less b/mozillians/static/mozillians/css/main.less
index c1b6acbaa..c61e3a41a 100644
--- a/mozillians/static/mozillians/css/main.less
+++ b/mozillians/static/mozillians/css/main.less
@@ -257,9 +257,18 @@ body {
         vertical-align: middle;
     }
 
-    .btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
+    .btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) {
         border-top-right-radius: 3px;
         border-bottom-right-radius: 3px;
+        border-top-left-radius: 0px;
+        border-bottom-left-radius: 0px;
+    }
+
+    .btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
+        border-top-right-radius: 0px;
+        border-bottom-right-radius: 0px;
+        border-top-left-radius: 3px;
+        border-bottom-left-radius: 3px;
     }
 
     .row {
@@ -1569,6 +1578,12 @@ form {
             label.required:after {  // No need to mark the privacy controls required, they always have some value.
               content: '';
             }
+            text-align: right;
+            .btn-group {
+                .privacy-toggle {
+                    float: right;
+                }
+            }
             @media (max-width: @breakTablet) {
                 position: relative;
                 top: auto;
diff --git a/mozillians/templates/phonebook/includes/photo_form.html b/mozillians/templates/phonebook/includes/photo_form.html
index c11bc7d5a..fe75bb959 100644
--- a/mozillians/templates/phonebook/includes/photo_form.html
+++ b/mozillians/templates/phonebook/includes/photo_form.html
@@ -10,7 +10,7 @@
       </div>
       <div class="row">
     {% endif %}
-    <div class="{% if profile.is_complete %}col-md-6 col-sm-6{% else %}col-md-12{% endif %}">
+    <div class="{% if profile.is_complete %}col-md-4 col-sm-5{% else %}col-md-12{% endif %}">
       <input class="input-file photo" id="id_photo" type="file" name="photo">
       {% if profile.photo %}
         <div id="id_photo_delete">
@@ -25,7 +25,7 @@
       </div>
       <div class="row">
     {% endif %}
-    <div class="{% if profile.is_complete %}col-md-3 text-right{% else %}col-md-12 registration-photo{% endif %}">
+    <div class="{% if profile.is_complete %}col-md-5 text-right{% else %}col-md-12 registration-photo{% endif %}">
       {% if profile.is_complete %}
         {{ privacy_field(basic_information_form.privacy_photo) }}
       {% else %}