diff --git a/app/assets/javascripts/clients.js b/app/assets/javascripts/clients.js
index 1a77cee..f28100b 100644
--- a/app/assets/javascripts/clients.js
+++ b/app/assets/javascripts/clients.js
@@ -1,39 +1,41 @@
 $(document).ready(function() {
         if ($('#select-files').size() > 0) {
                 $('#file-selector').hide();
+                $('#reset-button').hide();
                 $('#select-files').click(function() {
                           $('#file-selector').show();
+                          $('#reset-button').show();
                 });
         }
 });
 
 $(document).ready(function() {
         if ($('#file-submitter').size() > 0) {
                 $("#file-tree").on("select_node.jstree",
                         function(evt, data) {
                                 add_input(data.node.id);
                         });
                 $("#file-tree").on("deselect_node.jstree",
                         function(evt, data) {
                                 remove_input(data.node.id);
                         });
         }
         if ($('#invitation_user_id').size() > 0) {
                 $('#invitation_user_id').chosen();
         }
 });
 
 function add_input(id) {
         $('#file-submitter').
                 append('<input type="hidden" name="files[]" multiple="multiple" value="' + id + '" id="js-file-id-' + id + '" class="js-file-input"/>');
         if ($('.js-file-input').size() > 0 && $('#file-submitter > input[type="submit"]').attr('disabled') == 'disabled') {
                 $('#file-submitter > input[type="submit"]').attr('disabled', false);
         }
 }
 
 function remove_input(id) {
         $('#js-file-id-' + id).remove();
         if ($('.js-file-input').size() == 0) {
                 $('#file-submitter > input[type="submit"]').attr('disabled', true);
         }
 }
diff --git a/app/views/clients/_file_selector.html.erb b/app/views/clients/_file_selector.html.erb
index 10f3e61..7b7c98c 100644
--- a/app/views/clients/_file_selector.html.erb
+++ b/app/views/clients/_file_selector.html.erb
@@ -1,15 +1,22 @@
 <div id='file-selector' class="col-xs-4">
   <div class='panel panel-default'>
     <div class='panel-heading'>
       <h3> Files </h3>
     </div>
     <div class="loader">
       <h3>LOADING</h3>
     </div>
     <div id="file-tree"></div>
   </div>
 </div>
 
-<%= form_tag(restore_selected_client_path, { id: 'file-submitter', style: 'display:none' }) do %>
-  <%= submit_tag 'Restore Selected Files', class: 'btn btn-default', disabled: true %>
-<% end %>
+<div class="col-xs-2">
+  <%= form_tag(restore_selected_client_path, { id: 'file-submitter', style: 'display:none' }) do %>
+    <%= submit_tag 'Restore Selected Files', class: 'btn btn-default', disabled: true %>
+  <% end %>
+</div>
+
+<div class="col-xs-1" id="reset-button">
+  <%= link_to 'Cancel', restore_client_path(@client), role: 'button',
+              class: 'btn btn-default text-warning' %>
+</div>
diff --git a/app/views/clients/restore.html.erb b/app/views/clients/restore.html.erb
index 0c8d37b..8e356f0 100644
--- a/app/views/clients/restore.html.erb
+++ b/app/views/clients/restore.html.erb
@@ -1,74 +1,77 @@
 <div class="row">
   <div class="col-xs-4">
     <% if @client.is_backed_up? %>
       <div class="panel panel-default">
         <div class="panel-heading">
           <h3>Restore files for "<%= @client.name %>"</h3>
         </div>
 
         <div class="panel-body">
 
         <%= bootstrap_form_tag(url: run_restore_client_path(@client), remote: true,
                                layout: :horizontal, label_col: 'col-xs-4', control_col: 'col-xs-7',
                                html: { id: 'basic-form' } ) do |f| %>
           <%= help_block('Restore to most recent backup by leaving date and time blank',
                          'col-xs-4', 'col-xs-7') %>
           <%= f.text_field :restore_date %>
           <%= f.time_select :restore_time, ignore_date: true, minute_step: 30, prompt: true %>
 
           <%= f.select(:fileset,
                        options_from_collection_for_select(@client.file_sets, :id, :file_set)) %>
 
           <%= f.text_field :restore_location, placeholder: '/tmp/default_restore' %>
 
           <hr />
 
           <%= help_block(
             'Restore and backup clients <strong>must</strong> have the same encryption key'.html_safe,
             'col-xs-4', 'col-xs-7') %>
 
           <%= f.select(
             :restore_client,
             options_from_collection_for_select(@restore_clients,
                                                :id, :name, @client.id),
             label: tooltip_label('Restore Client',
                                  'Client where the backup will be restored to')) %>
 
           <hr />
 
           <div class="row">
             <div class="col-xs-5 col-xs-offset-6 text-right">
               <%= f.submit 'Select Specific Files', id: 'select-files', class: 'btn btn-primary'  %>
             </div>
           </div>
           <br />
           <div class="row">
             <div class="col-xs-3 col-xs-offset-8">
               <%= f.submit 'Restore All Files', class: 'btn btn-warning text-right',
                   data: { confirm: "This will restore all your files" }
               %>
             </div>
           </div>
         <% end %>
         </div>
       </div>
     <% else %>
       <div class="alert alert-warning">
         <p>Can not issue a restore for this client. It does not have any successful backups</p>
       </div>
     <% end %>
 
-    <%= link_to 'Back to client', client_path(@client), class: 'btn btn-danger', role: 'button' %>
+    <%= link_to client_path(@client), class: 'btn btn-default' do %>
+      <span class="glyphicon glyphicon-menu-left text-primary"></span>
+      Back to client
+    <% end %>
   </div>
   <%= render partial: 'file_selector' %>
 </div>
 <script type="text/javascript">
   <% min_date, max_date = @client.backup_enabled_datetime_range %>
   var minDate = '<%= min_date %>';
   var maxDate = '<%= max_date %>';
   $('#restore_date').datepicker({
     dateFormat: 'yy-mm-dd',
     minDate: minDate,
     maxDate: maxDate
   });
 </script>