diff --git a/RaceLapTimer/RaceLapTimer/ApiControllers/PilotApiModule.cs b/RaceLapTimer/RaceLapTimer/ApiControllers/PilotApiModule.cs
index ee7cdae..28f2001 100644
--- a/RaceLapTimer/RaceLapTimer/ApiControllers/PilotApiModule.cs
+++ b/RaceLapTimer/RaceLapTimer/ApiControllers/PilotApiModule.cs
@@ -38,27 +38,30 @@ namespace RaceLapTimer.ApiControllers
                 Directory.CreateDirectory(uploadDirectory);
             }
 
-            var file = Request.Files.First();
-
-            var newFileName = Guid.NewGuid();
-            var generatedFileName = string.Format("{0}{1}", newFileName, Path.GetExtension(file.Name)); //0000-0000.....ext
-
-            var filename = Path.Combine(uploadDirectory, generatedFileName);
-
-            using (var fileStream = new FileStream(filename, FileMode.Create))
+            if (Request.Files.Any())
             {
-                file.Value.CopyTo(fileStream);
-                fileStream.Flush();
-                fileStream.Close();
+                var file = Request.Files.First();
+
+                var newFileName = Guid.NewGuid();
+                var generatedFileName = string.Format("{0}{1}", newFileName, Path.GetExtension(file.Name)); //0000-0000.....ext
+
+                var filename = Path.Combine(uploadDirectory, generatedFileName);
+
+                using (var fileStream = new FileStream(filename, FileMode.Create))
+                {
+                    file.Value.CopyTo(fileStream);
+                    fileStream.Flush();
+                    fileStream.Close();
+                }
+
+                pilot.ImageUrl = "/images/" + generatedFileName;
+                _provider.UpdatePilot(pilot);
+
+                File.Delete(Path.Combine(uploadDirectory, oldImagePath));
+
             }
-
-            pilot.ImageUrl = "/images/" + generatedFileName;
-            _provider.UpdatePilot(pilot);
-
-            File.Delete(Path.Combine(uploadDirectory, oldImagePath));
-
             string returnurl = "/pilot/edit/" + pilotId;
-            return Context.GetRedirect(returnurl);
+            return Context.GetRedirect(returnurl); 
         }
 
         private dynamic DeletePilot(dynamic args)
diff --git a/RaceLapTimer/RaceLapTimer/RaceLapTimer.csproj b/RaceLapTimer/RaceLapTimer/RaceLapTimer.csproj
index 0e1115b..336c25f 100644
--- a/RaceLapTimer/RaceLapTimer/RaceLapTimer.csproj
+++ b/RaceLapTimer/RaceLapTimer/RaceLapTimer.csproj
@@ -166,7 +166,9 @@
     <None Include="www\Views\EditPilot.cshtml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="www\Views\History.cshtml" />
+    <None Include="www\Views\History.cshtml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="www\Views\HistoryIndex.cshtml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -191,7 +193,9 @@
     <None Include="www\Views\secure.cshtml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="www\Views\SystemIndex.cshtml" />
+    <None Include="www\Views\SystemIndex.cshtml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>
@@ -218,6 +222,9 @@
     <Content Include="www\css\login.css">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="www\css\site.css">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="www\css\stickyfooter.css">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
diff --git a/RaceLapTimer/RaceLapTimer/www/Views/HistoryIndex.cshtml b/RaceLapTimer/RaceLapTimer/www/Views/HistoryIndex.cshtml
index 61209b5..31824ad 100644
--- a/RaceLapTimer/RaceLapTimer/www/Views/HistoryIndex.cshtml
+++ b/RaceLapTimer/RaceLapTimer/www/Views/HistoryIndex.cshtml
@@ -4,6 +4,7 @@
     ViewBag.Title = "History";
 }
 <h3>@ViewBag.Title</h3>
+<link rel="stylesheet" href="css/site.css"/>
 
 <table class="table table-striped dataTable">
     <thead>
@@ -17,17 +18,19 @@
         </tr>
     </thead>
     <tbody data-bind="foreach: sessions, visible: sessions().length > 0">
-        <tr data-toggle="collapse" data-bind="attr: { 'data-target': '#collapse' + id() }">
-            <td class="text-center" data-bind="text: id"></td>
-            <td class="col-md-2" data-bind="text: createdDate">June 16, 2017 19:07</td>
-            <td data-bind="text: title">Race Name 1</td>
-            <td class="col-md-1" data-bind="text: mode">standard</td>
-            <td class="text-center col-md-1" >5</td>
+        <tr data-toggle="collapse" data-bind="attr: { 'data-target': '#collapse' + id() }, click: function(){return $root.toggleIcon('#expIcon'+id())}">
+            <td class="text-center vertical-center"><span data-bind="text: id"></span></td>
+            <td class="col-md-2 vertical-center"><span data-bind="text: createdDate"></span></td>
+            <td class="vertical-center" data-bind="text: title">Race Name 1</td>
+            <td class="col-md-1 vertical-center" data-bind="text: mode">standard</td>
+            <td class="text-center col-md-1 vertical-center" >5</td>
             <td class="col-md-3 text-center">
                 <button type="button" class="btn btn-warning" data-bind="click: $root.deleteSession">Delete</button>
                 <button type="button" class="btn btn-default">Export as PDF</button>
             </td>
-            <td><span class="glyphicon glyphicon-plus"></span></td>
+            <td class="vertical-center">
+                <span data-bind="attr:{id:'expIcon'+id()}" class="glyphicon glyphicon-plus"></span>
+            </td>
         </tr>
         <tr class="collapse" data-bind="attr:{ id: 'collapse' + id()}">
             <td colspan="6">
diff --git a/RaceLapTimer/RaceLapTimer/www/css/site.css b/RaceLapTimer/RaceLapTimer/www/css/site.css
new file mode 100644
index 0000000..e72b277
--- /dev/null
+++ b/RaceLapTimer/RaceLapTimer/www/css/site.css
@@ -0,0 +1,3 @@
+.table>tbody>tr>td.vertical-center {
+    vertical-align: middle;
+}
\ No newline at end of file
diff --git a/RaceLapTimer/RaceLapTimer/www/js/raceHistory.js b/RaceLapTimer/RaceLapTimer/www/js/raceHistory.js
index f479ec2..4594015 100644
--- a/RaceLapTimer/RaceLapTimer/www/js/raceHistory.js
+++ b/RaceLapTimer/RaceLapTimer/www/js/raceHistory.js
@@ -13,19 +13,26 @@
         var mappedSessions = $.map(allData.data, function (item) { return new RaceSession(item) });
         self.sessions(mappedSessions);
     });
+    self.toggleIcon = function(e) {
+        $(e).toggleClass("glyphicon-plus glyphicon-minus");
+    }
 };
 ko.applyBindings(new ViewModel());
 function toggleIcon(e) {
     $(e.target)
         .toggleClass("glyphicon-plus glyphicon-minus");
 }
-$(".dataTable").on("hidden.bs.collapse",
-    function toggleIcon(e) {
-        $(e.target)
-            .toggleClass("glyphicon-plus glyphicon-minus");
-    });
-$(".dataTable").on("shown.bs.collapse",
-    function toggleIcon(e) {
-        $(e.target)
-            .toggleClass("glyphicon-plus glyphicon-minus");
-    });
\ No newline at end of file
+//$(".dataTable").on("hidden.bs.collapse",
+//    function toggleIcon(e) {
+//        $(e.target)
+//            .find("tr.collapse")
+//            .find("td")
+//            .toggleClass("glyphicon-plus glyphicon-minus");
+//    });
+//$(".dataTable").on("shown.bs.collapse",
+//    function toggleIcon(e) {
+//        $(e.target)
+//            .find("tr.collapse")
+//            .find("td")
+//            .toggleClass("glyphicon-plus glyphicon-minus");
+//    });
\ No newline at end of file