diff --git a/src/Server/Coderr.Server.Api/Core/Incidents/Events/IncidentAssigned.cs b/src/Server/Coderr.Server.Api/Core/Incidents/Events/IncidentAssigned.cs
index 3af7e93d..bc2e19e2 100644
--- a/src/Server/Coderr.Server.Api/Core/Incidents/Events/IncidentAssigned.cs
+++ b/src/Server/Coderr.Server.Api/Core/Incidents/Events/IncidentAssigned.cs
@@ -45,7 +45,7 @@ protected IncidentAssigned()
         /// <summary>
         /// When the incident was assigned (client side)
         /// </summary>
-        public DateTime AssignedAtUtc { get; private set;  }
+        public DateTime AssignedAtUtc { get; private set; }
 
         /// <summary>
         ///     Incident being assigned
diff --git a/src/Server/Coderr.Server.App/Core/Accounts/AccountService.cs b/src/Server/Coderr.Server.App/Core/Accounts/AccountService.cs
index 02a42253..bf986609 100644
--- a/src/Server/Coderr.Server.App/Core/Accounts/AccountService.cs
+++ b/src/Server/Coderr.Server.App/Core/Accounts/AccountService.cs
@@ -86,9 +86,10 @@ public async Task<ClaimsIdentity> ActivateAccount(ClaimsPrincipal user, string a
                 throw new ArgumentOutOfRangeException("ActivationKey", activationKey,
                     "Key was not found.");
 
+
             account.Activate();
             await _repository.UpdateAsync(account);
-
+            
             
             if (!user.IsCurrentAccount(account.Id))
             {
diff --git a/src/Server/Coderr.Server.ReportAnalyzer/Incidents/IncidentBeingAnalyzed.cs b/src/Server/Coderr.Server.ReportAnalyzer/Incidents/IncidentBeingAnalyzed.cs
index 4c542907..d9ccced3 100644
--- a/src/Server/Coderr.Server.ReportAnalyzer/Incidents/IncidentBeingAnalyzed.cs
+++ b/src/Server/Coderr.Server.ReportAnalyzer/Incidents/IncidentBeingAnalyzed.cs
@@ -92,6 +92,11 @@ public string Description
             set => _description = value;
         }
 
+        /// <summary>
+        /// List of all environment names that the developer specified when reporting the errors.
+        /// </summary>
+        public string[] EnvironmentNames { get; set; }
+
         /// <summary>
         ///     Full name of the exception message.
         /// </summary>
diff --git a/src/Server/Coderr.Server.SqlServer/Core/Accounts/AccountRepository.cs b/src/Server/Coderr.Server.SqlServer/Core/Accounts/AccountRepository.cs
index 36ac39a7..4611842a 100644
--- a/src/Server/Coderr.Server.SqlServer/Core/Accounts/AccountRepository.cs
+++ b/src/Server/Coderr.Server.SqlServer/Core/Accounts/AccountRepository.cs
@@ -16,6 +16,7 @@ namespace Coderr.Server.SqlServer.Core.Accounts
     public class AccountRepository : IAccountRepository
     {
         private readonly IAdoNetUnitOfWork _uow;
+        private ILog _logger = LogManager.GetLogger(typeof(AccountRepository));
 
         public AccountRepository(IAdoNetUnitOfWork uow)
         {
@@ -43,7 +44,12 @@ public async Task<Account> FindByActivationKeyAsync(string activationKey)
             {
                 cmd.CommandText = "SELECT * FROM Accounts WHERE ActivationKey=@key";
                 cmd.AddParameter("key", activationKey);
-                return await cmd.FirstOrDefaultAsync(new AccountMapper());
+                var accounts= await cmd.ToListAsync(new AccountMapper());
+                if (accounts.Count == 0)
+                    return null;
+
+                _logger.Error($"Found {accounts.Count} accounts, expected one.");
+                return accounts.First();
             }
         }
 
diff --git a/src/Server/Coderr.Server.SqlServer/ReportAnalyzer/AnalyticsRepository.cs b/src/Server/Coderr.Server.SqlServer/ReportAnalyzer/AnalyticsRepository.cs
index 5ae3c1c2..ad57e0d2 100644
--- a/src/Server/Coderr.Server.SqlServer/ReportAnalyzer/AnalyticsRepository.cs
+++ b/src/Server/Coderr.Server.SqlServer/ReportAnalyzer/AnalyticsRepository.cs
@@ -113,7 +113,7 @@ from Environments
                                     begin
                                         INSERT INTO IncidentEnvironments (IncidentId, EnvironmentId)
                                         SELECT @incidentId, @environmentId
-                                        WHERE NOT EXISTS (SELECT IncidentId, EnvironmentId FROM IncidentEnvironment
+                                        WHERE NOT EXISTS (SELECT IncidentId, EnvironmentId FROM IncidentEnvironments
                                                          WHERE IncidentId=@incidentId AND EnvironmentId=@environmentId)
                                     end;";
                 cmd.AddParameter("incidentId", incidentId);
diff --git a/src/Server/Coderr.Server.SqlServer/ReportAnalyzer/ErrorReportEntityMapper.cs b/src/Server/Coderr.Server.SqlServer/ReportAnalyzer/ErrorReportEntityMapper.cs
index 56b774de..833e39a5 100644
--- a/src/Server/Coderr.Server.SqlServer/ReportAnalyzer/ErrorReportEntityMapper.cs
+++ b/src/Server/Coderr.Server.SqlServer/ReportAnalyzer/ErrorReportEntityMapper.cs
@@ -20,6 +20,9 @@ public ErrorReportEntityMapper() : base("ErrorReports")
                 .ToPropertyValue(x => null)
                 .ToColumnValue(x => "");
 
+            Property(x => x.EnvironmentName)
+                .Ignore();
+
             Property(x => x.ClientReportId)
                 .ColumnName("ErrorId");
 
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/analyze/analyze.vue.html b/src/Server/Coderr.Server.Web/ClientApp/components/analyze/analyze.vue.html
index e1b4fad2..4ce43a1f 100644
--- a/src/Server/Coderr.Server.Web/ClientApp/components/analyze/analyze.vue.html
+++ b/src/Server/Coderr.Server.Web/ClientApp/components/analyze/analyze.vue.html
@@ -1,7 +1,7 @@
 <template>
     <div>
         <analyze-menu />
-        <div class="col">
+        <div class="cold">
             <router-view></router-view>
         </div>
     </div>
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/analyze/home/home.ts b/src/Server/Coderr.Server.Web/ClientApp/components/analyze/home/home.ts
index 9b9d5ced..cea2dcb3 100644
--- a/src/Server/Coderr.Server.Web/ClientApp/components/analyze/home/home.ts
+++ b/src/Server/Coderr.Server.Web/ClientApp/components/analyze/home/home.ts
@@ -29,5 +29,8 @@ export default class AnalyzeHomeComponent extends Vue {
 
     private onReady() {
         this.showWelcome = MyIncidents.Instance.myIncidents.length === 0;
+        if (MyIncidents.Instance.myIncidents.length > 0) {
+            MyIncidents.Instance.switchIncident(MyIncidents.Instance.myIncidents[0].incidentId);
+        }
     }
 }
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/analyze/incidents/incident.vue.html b/src/Server/Coderr.Server.Web/ClientApp/components/analyze/incidents/incident.vue.html
index 6b01a426..d974009a 100644
--- a/src/Server/Coderr.Server.Web/ClientApp/components/analyze/incidents/incident.vue.html
+++ b/src/Server/Coderr.Server.Web/ClientApp/components/analyze/incidents/incident.vue.html
@@ -1,111 +1,109 @@
 <template>
     <div class="IncidentView">
-        <div>
-            <div class="row">
-                <div class="col">
-                    <div class="float-right">
-                        <div class="dropdown">
-                            <button type="button" class="btn btn-outline-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                Actions
-                            </button>
-                            <div class="dropdown-menu">
+        <div class="row">
+            <div class="col pl-4">
+                <div class="float-right">
+                    <div class="btn-group" role="group">
+                        <button class="btn btn-primary text-light" v-on:click="closeIncident">Close incident</button>
+                        <div class="dropdown" style="display: inline-block">
+                            <button type="button" class="btn btn-outline-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>
+                            <div class="dropdown-menu dropdown-menu-right">
                                 <span class="dropdown-item" v-on:click="reAssign"><i class="fa-redo fa text-muted"></i> Re-assign</span>
                                 <!--<span class="dropdown-item" v-on:click="addToTfs"><i class="fa-code-branch fa text-muted"></i> Add to TFS/VSTS</span>-->
-                                <span class="dropdown-item" v-on:click="closeIncident"><i class="fa-lock fa text-muted"></i> Close incident</span>
+
                             </div>
                         </div>
                     </div>
+                </div>
 
-                    <h3>{{incident.Description}} <span class="lead text-muted">[{{incident.FullName}}]</span></h3>
+                <h3>{{incident.Description}} <span class="lead text-muted">[{{incident.FullName}}]</span></h3>
 
 
-                    <div class="tags">
-                        <span v-for="tag in incident.Tags" class="badge badge-dark">{{tag}}</span>
-                    </div>
-                    <hr />
+                <div class="tags">
+                    <span v-for="tag in incident.Tags" class="badge badge-dark">{{tag}}</span>
                 </div>
             </div>
-            <div class="row" v-if="incident.Solution">
-                <div class="col">
-                    <div class="card">
-                        <div class="card-header">
-                            Previous solution ({{incident.SolvedAtUtc|ago}})
-                        </div>
-                        <div class="card-body">
-                            <div v-html="incident.Solution"></div>
-                        </div>
+        </div>
+        <div class="row" v-if="incident.Solution">
+            <div class="col">
+                <div class="card">
+                    <div class="card-header">
+                        Previous solution ({{incident.SolvedAtUtc|ago}})
+                    </div>
+                    <div class="card-body">
+                        <div v-html="incident.Solution"></div>
                     </div>
                 </div>
-
             </div>
-            <div class="row">
-                <div class="col-xl-8 col-lg-6">
-                    <div class="card">
-                        <div class="card-body">
-                            <h3>Stack trace</h3>
-                            <pre style="min-height: 200px"><code>{{incident.StackTrace}}</code></pre>
-                        </div>
+
+        </div>
+        <div class="row minimal-gutters">
+            <div class="col-xl-8 col-lg-6">
+                <div class="card">
+                    <div class="card-body">
+                        <h3>Stack trace</h3>
+                        <pre style="min-height: 200px"><code>{{incident.StackTrace}}</code></pre>
                     </div>
                 </div>
-                <div class="col-xl-4 col-lg-6">
-                    <div class="card" v-if="incident.Facts && incident.Facts.length > 0">
-                        <div class="card-body">
-                            <h3>Quick facts</h3>
-                            <div>
-                                <table class="table table-borderless">
-                                    <tbody>
-                                        <tr v-for="prop in incident.Facts" v-if="prop.Value != '0'">
-                                            <td>{{prop.Title}}</td>
-                                            <td>{{prop.Value}}</td>
-                                        </tr>
-                                    </tbody>
-                                </table>
-                            </div>
+            </div>
+            <div class="col-xl-4 col-lg-6">
+                <div class="card" v-if="incident.Facts && incident.Facts.length > 0">
+                    <div class="card-body">
+                        <h3>Quick facts</h3>
+                        <div>
+                            <table class="table table-borderless">
+                                <tbody>
+                                    <tr v-for="prop in incident.Facts" v-if="prop.Value != '0'">
+                                        <td>{{prop.Title}}</td>
+                                        <td>{{prop.Value}}</td>
+                                    </tr>
+                                </tbody>
+                            </table>
                         </div>
                     </div>
+                </div>
 
-                    <div class="card">
-                        <div class="card-body">
-                            <h3>Context collections</h3>
-                            <div>
-                                <div class="dropdown" style="display: inline">
-                                    <button type="button" class="btn btn-light dropdown-toggle btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                        {{currentReportName}}
-                                    </button>
-                                    <div class="dropdown-menu">
-                                        <h6 class="dropdown-header">Select report</h6>
-                                        <div v-for="report in reports">
-                                            <a class="dropdown-item" href="#" v-on:click.prevent="loadReport(report.Id)"><i class="fa-desktop fa text-muted"></i> {{report.CreatedAtUtc|ago}}</a>
-                                        </div>
+                <div class="card">
+                    <div class="card-body">
+                        <h3>Context collections</h3>
+                        <div>
+                            <div class="dropdown" style="display: inline">
+                                <button type="button" class="btn btn-light dropdown-toggle btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                    {{currentReportName}}
+                                </button>
+                                <div class="dropdown-menu">
+                                    <h6 class="dropdown-header">Select report</h6>
+                                    <div v-for="report in reports">
+                                        <a class="dropdown-item" href="#" v-on:click.prevent="loadReport(report.Id)"><i class="fa-desktop fa text-muted"></i> {{report.CreatedAtUtc|ago}}</a>
                                     </div>
                                 </div>
-                                <div class="dropdown" style="display: inline">
-                                    <button type="button" class="btn btn-light dropdown-toggle btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="reportChooser">
-                                        {{currentCollectionName}}
-                                    </button>
-                                    <div class="dropdown-menu">
-                                        <h6 class="dropdown-header">Select context collection</h6>
-                                        <div v-for="collection in currentReport.ContextCollections">
-                                            <span class="dropdown-item" v-on:click="loadCollection(collection.Name)"><i class="fa-table fa text-muted"></i> {{collection.Name}}</span>
-                                        </div>
+                            </div>
+                            <div class="dropdown" style="display: inline">
+                                <button type="button" class="btn btn-light dropdown-toggle btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="reportChooser">
+                                    {{currentCollectionName}}
+                                </button>
+                                <div class="dropdown-menu">
+                                    <h6 class="dropdown-header">Select context collection</h6>
+                                    <div v-for="collection in currentReport.ContextCollections">
+                                        <span class="dropdown-item" v-on:click="loadCollection(collection.Name)"><i class="fa-table fa text-muted"></i> {{collection.Name}}</span>
                                     </div>
                                 </div>
                             </div>
-                            <div v-if="currentReport.Id > 0" style="overflow: auto">
-                                <table class="table mt-3 mb-3">
-                                    <tbody>
-                                        <tr v-for="prop in currentCollection.Properties">
-                                            <td>{{prop.Key}}</td>
-                                            <td v-html="prop.Value"></td>
-                                        </tr>
-                                    </tbody>
-                                </table>
-                            </div>
-                            <hr />
-                            <em>
-                                <router-link class="btn btn-primary btn-block" :to="{ name: 'analyzeReport', params: { reportId: currentReport.Id, incidentId: incident.Id}}">View entire report</router-link>
-                            </em>
-                         </div>
+                        </div>
+                        <div v-if="currentReport.Id > 0" style="overflow: auto">
+                            <table class="table mt-3 mb-3">
+                                <tbody>
+                                <tr v-for="prop in currentCollection.Properties">
+                                    <td>{{prop.Key}}</td>
+                                    <td v-html="prop.Value"></td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                        <em v-if="currentReport.Id > 0" >
+                            <router-link class="btn btn-primary btn-block" :to="{ name: 'analyzeReport', params: { reportId: currentReport.Id, incidentId: incident.Id}}">Report browser</router-link>
+                        </em>
+
                     </div>
                 </div>
             </div>
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/analyze/incidents/report.css b/src/Server/Coderr.Server.Web/ClientApp/components/analyze/incidents/report.css
index 123737cd..a469df76 100644
--- a/src/Server/Coderr.Server.Web/ClientApp/components/analyze/incidents/report.css
+++ b/src/Server/Coderr.Server.Web/ClientApp/components/analyze/incidents/report.css
@@ -9,10 +9,16 @@
     display: none;
 }
 
-.ReportsView .contextCollections th, .ReportsView .contextCollections td {
+.collection a {
+    padding: 5px;
+    margin: 5px;
+    display: block;
+}
+.ReportsView .contextCollections th, .ReportsView .contextCollections td, .ReportsView h4 {
     padding: 0.15rem;
 }
 
+
 .contextCollections .card {
     overflow-x: scroll;
     overflow-y: auto
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/analyze/incidents/report.ts b/src/Server/Coderr.Server.Web/ClientApp/components/analyze/incidents/report.ts
index 053fc59e..cb3ac7ec 100644
--- a/src/Server/Coderr.Server.Web/ClientApp/components/analyze/incidents/report.ts
+++ b/src/Server/Coderr.Server.Web/ClientApp/components/analyze/incidents/report.ts
@@ -97,6 +97,7 @@ export default class AnalyzeReportComponent extends Vue {
 
         if (reportId !== this.reportId) {
             this.reportId = reportId;
+            console.log('got report id', this.reportId);
             this.$router.push({ name: 'analyzeReport', params: { reportId: reportId.toString(), incidentId: this.incidentId.toString() } });
         }
 
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/analyze/menu.ts b/src/Server/Coderr.Server.Web/ClientApp/components/analyze/menu.ts
index b43990cb..7a24e1c1 100644
--- a/src/Server/Coderr.Server.Web/ClientApp/components/analyze/menu.ts
+++ b/src/Server/Coderr.Server.Web/ClientApp/components/analyze/menu.ts
@@ -22,33 +22,17 @@ export default class AnalyzeMenuComponent extends Vue {
     created() {
         MyIncidents.Instance.subscribeOnSelectedIncident(this.onIncidentSelected);
         MyIncidents.Instance.subscribeOnListChanges(this.onListChanged);
-        MyIncidents.Instance.ready()
-            .then(x => {
-                this.incidents = MyIncidents.Instance.myIncidents;
-            });
-
-        if (this.$route.params.incidentId) {
-            this.incidentId = parseInt(this.$route.params.incidentId, 10);
-            MyIncidents.Instance.switchIncident(this.incidentId);
-        }
     }
 
     mounted() {
-        MyIncidents.Instance.ready().then(() => {
-            if (!this.$route.params.incidentId) {
-                if (MyIncidents.Instance.myIncidents.length === 0) {
-                    return;
+        MyIncidents.Instance.ready()
+            .then(() => {
+                if (MyIncidents.Instance.incident) {
+                    this.incidentId = MyIncidents.Instance.incident.incidentId;
+                    this.title = MyIncidents.Instance.incident.title;
                 }
-
-                var incident = MyIncidents.Instance.myIncidents[0];
-                this.$router.push({ name: 'analyzeIncident', params: { incidentId: incident.incidentId.toString() } });
-                return;
-            }
-
-            if (this.incidentId) {
-                MyIncidents.Instance.switchIncident(this.incidentId);
-            }
-        });
+                this.incidents = MyIncidents.Instance.myIncidents;
+            });
     }
 
     destroyed() {
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/analyze/myincidents.ts b/src/Server/Coderr.Server.Web/ClientApp/components/analyze/myincidents.ts
index 6a54aa8d..580a3a6c 100644
--- a/src/Server/Coderr.Server.Web/ClientApp/components/analyze/myincidents.ts
+++ b/src/Server/Coderr.Server.Web/ClientApp/components/analyze/myincidents.ts
@@ -61,6 +61,11 @@ export class MyIncidents {
         });
     }
 
+    public get incident(): IMyIncident {
+        return this.selectedIncident;
+    }
+
+
     async ready() {
         await this.loadPromise$;
     }
@@ -87,7 +92,7 @@ export class MyIncidents {
             }
         }
 
-        this.getNextIncident();
+        this.setNextIncident();
     }
 
     async switchIncident(incidentId: number) {
@@ -97,7 +102,7 @@ export class MyIncidents {
 
         var incident = await this.getIncident(incidentId);
         if (incident == null) {
-            this.getNextIncident();
+            this.setNextIncident();
         } else {
             this.selectedIncident = incident;
             this.triggerIncidentChangedCallbacks();
@@ -132,6 +137,7 @@ export class MyIncidents {
 
     private onIncidentAssigned(msgContext: MessageContext) {
         var msg = <IncidentAssigned>msgContext.message.body;
+        console.log('got assigned: ' + msg.incidentId)
         AppRoot.Instance.incidentService.get(msg.incidentId)
             .then(assignedIncident => {
                 if (this.allMyIncidents$.findIndex(menuItem => menuItem.incidentId === assignedIncident.Id) === -1) {
@@ -140,6 +146,9 @@ export class MyIncidents {
                     this.filterMyIncidents();
                     this.triggerIncidentListCallbacks(item.incidentId, true);
                 }
+
+                // always switch to correct incident upon assign
+                this.switchIncident(msg.incidentId);
             });
     }
 
@@ -249,11 +258,11 @@ export class MyIncidents {
 
 
         if (this.selectedIncident == null || incidentId === this.selectedIncident.incidentId) {
-            this.getNextIncident();
+            this.setNextIncident();
         }
     }
 
-    private getNextIncident() {
+    private setNextIncident() {
         if (this.myIncidents.length > 0) {
             this.selectedIncident = this.myIncidents[0];
         } else {
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/discover/discover.vue.html b/src/Server/Coderr.Server.Web/ClientApp/components/discover/discover.vue.html
index bbd14d06..bbe062d1 100644
--- a/src/Server/Coderr.Server.Web/ClientApp/components/discover/discover.vue.html
+++ b/src/Server/Coderr.Server.Web/ClientApp/components/discover/discover.vue.html
@@ -1,7 +1,7 @@
 <template>
     <div>
         <discover-menu />
-        <div class="mt-2 mr-2 ml-2" id="DiscoverView">
+        <div class="" id="DiscoverView">
             <router-view></router-view>
         </div>
     </div>
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/discover/home/home.css b/src/Server/Coderr.Server.Web/ClientApp/components/discover/home/home.css
index 9ac0040a..82c06a8d 100644
--- a/src/Server/Coderr.Server.Web/ClientApp/components/discover/home/home.css
+++ b/src/Server/Coderr.Server.Web/ClientApp/components/discover/home/home.css
@@ -6,12 +6,6 @@
     display: none;
 }
 
-
-.card .card-body ul {
-    padding-left: 10px;
-}
-
-
 /*.coderr-chart {
     margin-right: 40px;
 }*/
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/discover/home/home.vue.html b/src/Server/Coderr.Server.Web/ClientApp/components/discover/home/home.vue.html
index e9eff045..9df50466 100644
--- a/src/Server/Coderr.Server.Web/ClientApp/components/discover/home/home.vue.html
+++ b/src/Server/Coderr.Server.Web/ClientApp/components/discover/home/home.vue.html
@@ -1,76 +1,65 @@
 <template>
     <div class="">
-        <div class="row">
+        <div class="row minimal-gutters">
             <div class="col-lg-3">
-                <div class="row">
-
-                    <div class="col-lg-12">
-                        <div class="card mb-1">
-                            <div class="card-header">
-                                Summary (last 30 days)
-                            </div>
-                            <div class="card-body">
-                                <table class="table table-borderless th-vertical">
-                                    <tbody>
-                                        <tr>
-                                            <th width="30%">Number of incidents</th>
-                                            <td>{{ incidentCount }}</td>
-                                        </tr>
-                                        <tr style="white-space: nowrap">
-                                            <th>Number of error reports</th>
-                                            <td>{{ reportCount }}</td>
-                                        </tr>
-                                        <tr v-if="followers > 0">
-                                            <th title="Number of users that want status updates">Incident followers (users)</th>
-                                            <td>{{ followers }}</td>
-                                        </tr>
-                                        <tr v-if="feedbackCount > 0">
-                                            <th>Number of user reports</th>
-                                            <td>{{ feedbackCount }}</td>
-                                        </tr>
-                                    </tbody>
-                                </table>
-
-                            </div>
-                        </div>
+                <div class="card mb-1">
+                    <div class="card-header">
+                        Summary (last 30 days)
                     </div>
+                    <div class="card-body">
+                        <table class="table th-vertical">
+                            <tbody>
+                                <tr>
+                                    <th width="30%">Number of incidents</th>
+                                    <td>{{ incidentCount }}</td>
+                                </tr>
+                                <tr style="white-space: nowrap">
+                                    <th>Number of error reports</th>
+                                    <td>{{ reportCount }}</td>
+                                </tr>
+                                <tr v-if="followers > 0">
+                                    <th title="Number of users that want status updates">Incident followers (users)</th>
+                                    <td>{{ followers }}</td>
+                                </tr>
+                                <tr v-if="feedbackCount > 0">
+                                    <th>Number of user reports</th>
+                                    <td>{{ feedbackCount }}</td>
+                                </tr>
+                            </tbody>
+                        </table>
 
-                    <div class="col-lg-12 ">
-                        <div class="card bg-blue mb-1 p-2" v-if="reportCount == 0">
-                            <div class="">
-                                <h3>Report exceptions</h3>
-                                <p class="text-white">
-                                    You have not reported any exceptions yet.
-                                </p>
-                                <router-link :to="{name: 'configureApplication', params: {applicationId: firstApplicationId }}" class="btn btn-dark">Configure your application</router-link>
-                            </div>
-                        </div>
                     </div>
-
-                    <div class="col-lg-12">
-                        <div class="card" v-if="myIncidents.length > 0">
-                            <div class="card-header">
-                                My incidents
-                            </div>
-                            <div class="card-body">
-                                <ul>
-                                    <li v-for="incident in myIncidents">
-                                        <router-link :to="{ name: 'analyzeIncident', params: { applicationId: incident.applicationId, incidentId: incident.Id }}">{{incident.Name}}</router-link>
-                                    </li>
-                                </ul>
-                                <div v-if="myIncidents.length == 0">
-                                    <p class="text-info">
-                                        You are currently not working with an incident.
-                                    </p>
-                                    <router-link class="btn btn-primary" to="incidents">Find incidents</router-link>
-                                </div>
-                                <div v-if="myBestSuggestion">
-                                    <hr />
-                                    We suggest that you work with:
-                                    <router-link :to="{ name: 'analyzeIncident', params: { applicationId: myBestSuggestion.applicationId, myBestSuggestion: incident.Id }}">{{myBestSuggestion.Description}}</router-link>
-                                    <router-link class="btn btn-primary btn-sm" v-bind:click="assignBestToMe">{{myBestSuggestion.Description}}</router-link>
-                                </div>
-                            </div>
+                </div>
+                <div class="card bg-blue mb-1 p-2" v-if="reportCount != 0">
+                    <div class="">
+                        <h3>Report exceptions</h3>
+                        <p class="text-white">
+                            You have not reported any exceptions yet.
+                        </p>
+                        <router-link :to="{name: 'configureApplication', params: {applicationId: firstApplicationId }}" class="btn btn-dark">Configure your application</router-link>
+                    </div>
+                </div>
+                <div class="card" v-if="myIncidents.length > 0">
+                    <div class="card-header">
+                        My incidents
+                    </div>
+                    <div class="card-body">
+                        <ul>
+                            <li v-for="incident in myIncidents">
+                                <router-link :to="{ name: 'analyzeIncident', params: { applicationId: incident.applicationId, incidentId: incident.Id }}">{{incident.Name}}</router-link>
+                            </li>
+                        </ul>
+                        <div v-if="myIncidents.length == 0">
+                            <p class="text-info">
+                                You are currently not working with an incident.
+                            </p>
+                            <router-link class="btn btn-primary" to="incidents">Find incidents</router-link>
+                        </div>
+                        <div v-if="myBestSuggestion">
+                            <hr />
+                            We suggest that you work with:
+                            <router-link :to="{ name: 'analyzeIncident', params: { applicationId: myBestSuggestion.applicationId, myBestSuggestion: incident.Id }}">{{myBestSuggestion.Description}}</router-link>
+                            <router-link class="btn btn-primary btn-sm" v-bind:click="assignBestToMe">{{myBestSuggestion.Description}}</router-link>
                         </div>
                     </div>
                 </div>
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/discover/incidents/incident.vue.html b/src/Server/Coderr.Server.Web/ClientApp/components/discover/incidents/incident.vue.html
index 31893fe8..e8a3ac6a 100644
--- a/src/Server/Coderr.Server.Web/ClientApp/components/discover/incidents/incident.vue.html
+++ b/src/Server/Coderr.Server.Web/ClientApp/components/discover/incidents/incident.vue.html
@@ -1,6 +1,6 @@
 <template>
     <div id="IncidentSearchView">
-        <div class="row mb-2">
+        <div class="row mb-2 mt-2">
             <div class="col-lg-12">
                 <h3>{{incident.Description}} <small class="text-muted">[{{incident.FullName}}]</small></h3>
                 <div class="">
@@ -8,10 +8,8 @@ <h3>{{incident.Description}} <small class="text-muted">[{{incident.FullName}}]</
                     <div class="float-right">
                         <a class="btn btn-primary" href="#" v-if="incident.IncidentState == 0" v-on:click.prevent="assignToMe">Assign to me</a>
                         <div class="dropdown" style="display: inline-block">
-                            <button class="btn btn-outline-primary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                Other actions
-                            </button>
-                            <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
+                            <button class="btn btn-outline-primary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>
+                            <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
                                 <a class="dropdown-item" href="#" v-if="incident.IncidentState == 0" v-on:click.prevent="assignToSomeoneElse">Assign to ..</a>
                                 <a class="dropdown-item" href="#" v-if="!isClosed" v-on:click.prevent="close">Close incident</a>
                                 <a class="dropdown-item" href="#" v-if="!isClosed && !isIgnored" v-on:click.prevent="ignore">Ignore incident</a>
@@ -21,12 +19,12 @@ <h3>{{incident.Description}} <small class="text-muted">[{{incident.FullName}}]</
                 </div>
             </div>
         </div>
-        <div class="row">
+        <div class="row minimal-gutters">
             <div class="col-lg-12">
-                <div class="card">
+                <div class="card  bg-dark">
                     <div class="card-body">
                         <div class="position-relative">
-                            <h3>Report history</h3>
+                            <h3 class="">Report history</h3>
                             <div class="ct-chart incident-chart">
 
                             </div>
@@ -36,7 +34,7 @@ <h3>Report history</h3>
                 </div>
             </div>
         </div>
-        <div class="row">
+        <div class="row minimal-gutters">
             <div class="col-lg-8">
                 <div class="card">
                     <div class="card-body">
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/discover/incidents/search.ts b/src/Server/Coderr.Server.Web/ClientApp/components/discover/incidents/search.ts
index effed2ad..86eb2c16 100644
--- a/src/Server/Coderr.Server.Web/ClientApp/components/discover/incidents/search.ts
+++ b/src/Server/Coderr.Server.Web/ClientApp/components/discover/incidents/search.ts
@@ -73,7 +73,6 @@ export default class IncidentSearchComponent extends Vue {
     private inactiveBtn$ = 'btn-black';
 
     created() {
-        console.log('created', this.activeApplications);
         PubSubService.Instance.subscribe(MenuApi.MessagingTopics.ApplicationChanged, this.onApplicationChangedInNavMenu);
 
         //fetch in created since we do not need the DOM
@@ -107,7 +106,6 @@ export default class IncidentSearchComponent extends Vue {
             AppRoot.Instance.apiClient.query<GetEnvironmentsResult>(q)
                 .then(x => {
                     this.availableEnvironments.length = 0;
-                    console.log(x.Items);
                     x.Items.forEach(x => {
                         this.availableEnvironments.push({ id: x.Id, name: x.Name });
                     });
@@ -117,13 +115,11 @@ export default class IncidentSearchComponent extends Vue {
         this.readyPromises$.push(promise2);
 
         PubSubService.Instance.subscribe(AppEvents.Created, ctx => {
-            console.log('appCreated', ctx, this.activeApplications);
             var msg = <ApplicationCreated>ctx.message.body;
             this.availableApplications.push({ id: msg.id, name: msg.name });
         });
 
         if (this.$route.params.applicationId) {
-            console.log('routeAppId', this.$route.params.applicationId);
             var appId = parseInt(this.$route.params.applicationId, 10);
             this.activeApplications = [appId];
             this.showApplicationColumn = false;
@@ -131,14 +127,12 @@ export default class IncidentSearchComponent extends Vue {
     }
 
     destroyed() {
-        console.log('destroyed', this.activeApplications);
         PubSubService.Instance.unsubscribe(MenuApi.MessagingTopics.ApplicationChanged, this.onApplicationChangedInNavMenu);
         this.destroyed$ = true;
     }
 
     mounted() {
         this.destroyed$ = false;
-        console.log('mounted', this.activeApplications);
 
         var readyPromise = AppRoot.Instance.loadState('incident-search', this);
         this.readyPromises$.push(readyPromise);
@@ -206,7 +200,6 @@ export default class IncidentSearchComponent extends Vue {
     }
 
     toggleApplication(e: MouseEvent) {
-        console.log('toogle application')
         var btn = <HTMLButtonElement>e.target;
         var attr = btn.getAttribute('data-app');
         var applicationId = parseInt(<string>attr, 10);
@@ -262,7 +255,7 @@ export default class IncidentSearchComponent extends Vue {
         query.SortType = this.sortKey;
         query.Tags = this.activeTags;
 
-        if (this.activeApplications.length > 0) {
+        if (this.activeApplications.length > 0  && this.showApplicationColumn) {
             query.ApplicationIds = this.activeApplications;
         }
 
@@ -352,7 +345,6 @@ export default class IncidentSearchComponent extends Vue {
     }
 
     private onApplicationChangedInNavMenu(ctx: MessageContext) {
-        console.log('aaaaahhhhar ', ctx.message);
         if (this.$route.name !== 'findIncidents') {
             return;
         }
@@ -375,10 +367,14 @@ export default class IncidentSearchComponent extends Vue {
         }
 
         var us = document.querySelector('.search-head th[data-value="' + this.sortKey + '"] i');
-        if (this.ascendingSort) {
-            us.classList.add('fa-chevron-up');
+        if (us == null) {
+            console.log('failed to find', '.search-head th[data-value="' + this.sortKey + '"] i');
         } else {
-            us.classList.add('fa-chevron-down');
+            if (this.ascendingSort) {
+                us.classList.add('fa-chevron-up');
+            } else {
+                us.classList.add('fa-chevron-down');
+            }
         }
 
     }
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/discover/incidents/search.vue.html b/src/Server/Coderr.Server.Web/ClientApp/components/discover/incidents/search.vue.html
index 6c68f74c..de017882 100644
--- a/src/Server/Coderr.Server.Web/ClientApp/components/discover/incidents/search.vue.html
+++ b/src/Server/Coderr.Server.Web/ClientApp/components/discover/incidents/search.vue.html
@@ -1,6 +1,6 @@
 <template>
     <div id="IncidentSearchView">
-        <div class="row ">
+        <div class="row">
             <div class="col">
                 <div id="SearchOptions" class="bg-dark card-body">
                     <div class="form-group input-group-sm">
@@ -78,10 +78,10 @@
                 </div>
             </div>
         </div>
-        <div class="row bg-light mt-2 pb-3">
-            <div class="col no-gutters">
+        <div class="row pb-4" v-if="incidents.length > 0">
+            <div class="col">
                 <table class="table w-100 table-striped checkboxes" id="searchTable" style="table-layout: fixed">
-                    <thead class="table-light search-head bg-dark">
+                    <thead class="table-light search-head bg-blue">
                         <tr>
                             <th><input class="form-check-inline" type="checkbox" v-on:change="checkAll($event)" /> Name</th>
                             <th v-if="showApplicationColumn">Application</th>
@@ -111,13 +111,6 @@
                         </tr>
                     </tbody>
                 </table>
-                <div v-if="incidents.length == 0" class="mt-4">
-                    <em>No incidents have been reported (or nothing matched your search).</em>
-                </div>
-                <div v-else>
-                    <button class="btn btn-blue" v-on:click.prevent="assignAllToMe">Assign selected incidents to me</button>
-                    <button class="btn btn-dark" v-on:click.prevent="closeSelectedIncidents">Close selected incidents</button>
-                </div>
             </div>
             <div id="CloseBody" style="display: none">
                 <input type="text" name="version" class="form-control mb-3" size="10" placeholder="Which version is the error corrected in? (format: 1.2.10)" pattern="[0-9\.]*" title="You can use semantic versioning, including pre-releases, but must specify the release version here." />
@@ -125,6 +118,17 @@
                 <em><router-link :to="{name: 'closeIncident', params: { incidentId: currentIncidentId }}">Go to full screen editor</router-link></em>
             </div>
         </div>
+        <div class="row">
+            <div class="col bg-dark p-3">
+                <div v-if="incidents.length == 0" class="m-4">
+                    <em>No incidents have been reported (or nothing matched your search).</em>
+                </div>
+                <div v-else>
+                    <button class="btn btn-blue" v-on:click.prevent="assignAllToMe">Assign selected incidents to me</button>
+                    <button class="btn btn-light" v-on:click.prevent="closeSelectedIncidents">Close selected incidents</button>
+                </div>
+            </div>
+        </div>
     </div>
 </template>
 
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/discover/menu.ts b/src/Server/Coderr.Server.Web/ClientApp/components/discover/menu.ts
index e227705f..28a407b1 100644
--- a/src/Server/Coderr.Server.Web/ClientApp/components/discover/menu.ts
+++ b/src/Server/Coderr.Server.Web/ClientApp/components/discover/menu.ts
@@ -36,7 +36,6 @@ export default class DiscoverMenuComponent extends Vue {
     }
 
     created() {
-        console.log('CREATED');
         PubSubService.Instance.subscribe(MenuApi.MessagingTopics.ApplicationChanged, this.onChanged);
     }
 
@@ -46,21 +45,17 @@ export default class DiscoverMenuComponent extends Vue {
         }
 
         var appId = parseInt(this.$route.params.applicationId);
-        console.log('DiscoverMenuComponent.changed3,', appId, 'old', this.currentApplicationId);
         this.currentApplicationId = appId;
     }
 
     destroyed() {
-        console.log('destroyed');
         PubSubService.Instance.unsubscribe(MenuApi.MessagingTopics.ApplicationChanged, this.onChanged);
     }
 
     testMe(e: any) {
-        console.log('DiscoverMenuComponent.CLICK: ',e);
     }
 
     private onChanged(ctx: MessageContext) {
-        console.log('DiscoverMenuComponent.OnChanged,', ctx, 'old', this.currentApplicationId);
         var msg = <MenuApi.SetApplication>ctx.message.body;
         this.currentApplicationId = msg.applicationId;
     }
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/discover/menu.vue.html b/src/Server/Coderr.Server.Web/ClientApp/components/discover/menu.vue.html
index 74ad23cd..ebacfe29 100644
--- a/src/Server/Coderr.Server.Web/ClientApp/components/discover/menu.vue.html
+++ b/src/Server/Coderr.Server.Web/ClientApp/components/discover/menu.vue.html
@@ -1,5 +1,5 @@
 <template>
-    <div class="mb-3 discover-menu">
+    <div class="discover-menu">
         <div class="navbar-light navbar bg-light">
             <ul class="nav">
                 <li class="nav-item">
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/home/home.css b/src/Server/Coderr.Server.Web/ClientApp/components/home/home.css
index 67b4797e..29ac2792 100644
--- a/src/Server/Coderr.Server.Web/ClientApp/components/home/home.css
+++ b/src/Server/Coderr.Server.Web/ClientApp/components/home/home.css
@@ -3,26 +3,27 @@
     bottom: 0
 }
 
-.onboarding .card {
-    background-color: #393938; /*gray-700*/
-    color: #ffffff;
-    margin-right: 10px;
+.onboarding a {
+    color: #f18c65;
 }
 
+.onboarding a.btn, .onboarding button.btn {
+    color: #fff;
+}
 
-    .onboarding .card:last-child {
-        margin-right: 0;
-    }
-
-    .onboarding .card .card-footer, .onboarding .card .card-header {
-        background: transparent;
-        border: none;
-    }
 
+.onboarding .card .card-footer, .onboarding .card .card-header {
+    background: transparent;
+    border: none;
+}
 
-    .onboarding .card a {
-        color: #f18c65;
-    }
+/*.onboarding .card-group {
+    padding: 5px;
+}*/
+.onboarding .card, .onboarding .card * {
+    margin-right: 10px;
+    color: #000;
+}
 
         .onboarding .card a.btn {
             color: #fff;
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/home/home.vue.html b/src/Server/Coderr.Server.Web/ClientApp/components/home/home.vue.html
index be94be5b..8d47f546 100644
--- a/src/Server/Coderr.Server.Web/ClientApp/components/home/home.vue.html
+++ b/src/Server/Coderr.Server.Web/ClientApp/components/home/home.vue.html
@@ -1,6 +1,6 @@
 <template>
     <div class="onboarding">
-        <div v-show="showOnboarding">
+        <div v-show="showOnboarding" class="bg-dark pb-5">
             <div class="row">
                 <div class="col mb-2 mt-5">
                     <div class="m-4">
@@ -32,7 +32,7 @@ <h3>Report errors</h3>
 
                         </div>
                         <div class="card-footer">
-                            <button class="btn btn-primary" @click.prevent="start">Configuration wizard</button>
+                            <button class="btn btn-dark" @click.prevent="start">Configuration wizard</button>
                         </div>
                     </div>
                     <div class="card">
@@ -48,7 +48,7 @@ <h3>Application configuration (admin only)</h3>
                             </p>
                         </div>
                         <div class="card-footer">
-                            <a class="btn btn-primary" :href="`manage/application/${appId}`">
+                            <a class="btn btn-dark" :href="`manage/application/${appId}`">
                                 Application settings
                             </a>
                         </div>
@@ -62,7 +62,7 @@ <h3>Invite co-workers (admin only)</h3>
                             <p>To invite co-workers, use the Cog wheel (<i class="fa fa-cog text-primary"></i>) found in top right menu, select one of your applications and then use the "Security" tab.</p>
                         </div>
                         <div class="card-footer">
-                            <a class="btn btn-primary" :href="`manage/application/${appId}/security`">
+                            <a class="btn btn-dark" :href="`manage/application/${appId}/security`">
                                 Invite co-workers
                             </a>
                         </div>
@@ -88,7 +88,7 @@ <h3>Disable Coderr in Development environments</h3>
 
                         </div>
                         <div class="card-footer">
-                            <a class="btn btn-primary" href="https://coderr.io/documentation/getting-started/#before-going-to-production">Learn more</a>
+                            <a class="btn btn-dark" href="https://coderr.io/documentation/getting-started/#before-going-to-production">Learn more</a>
                         </div>
                     </div>
                 </div>
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/manage/application/app.ts b/src/Server/Coderr.Server.Web/ClientApp/components/manage/application/app.ts
index a136aa4b..8a158755 100644
--- a/src/Server/Coderr.Server.Web/ClientApp/components/manage/application/app.ts
+++ b/src/Server/Coderr.Server.Web/ClientApp/components/manage/application/app.ts
@@ -28,6 +28,5 @@ export default class ManageComponent extends Vue {
     }
 
     private testMe(e:any) {
-        console.log('TEST ME ',e);
     }
 }
diff --git a/src/Server/Coderr.Server.Web/ClientApp/services/PubSub.ts b/src/Server/Coderr.Server.Web/ClientApp/services/PubSub.ts
index 0310f1c2..df4322db 100644
--- a/src/Server/Coderr.Server.Web/ClientApp/services/PubSub.ts
+++ b/src/Server/Coderr.Server.Web/ClientApp/services/PubSub.ts
@@ -33,7 +33,6 @@ export class PubSubService {
     }
 
     publish(topicName: string, message: Message | any) {
-        console.log('PUBLISH ', topicName)
         if (!message.hasOwnProperty("type")) {
             message = {
                 body: message,
diff --git a/src/Server/Coderr.Server.Web/Coderr.Server.Web.csproj b/src/Server/Coderr.Server.Web/Coderr.Server.Web.csproj
index 5eb5bf22..3a14d60e 100644
--- a/src/Server/Coderr.Server.Web/Coderr.Server.Web.csproj
+++ b/src/Server/Coderr.Server.Web/Coderr.Server.Web.csproj
@@ -63,6 +63,7 @@
     <Message Importance="high" Text="Performing first-run Webpack build..." />
     <Exec Command="node node_modules/webpack/bin/webpack.js --config webpack.config.vendor.js" />
     <Exec Command="node node_modules/webpack/bin/webpack.js" />
+    <Exec Command="node node_modules/gulp/bin/gulp.js" />
   </Target>
 
   <Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish">
@@ -70,6 +71,7 @@
     <Exec Command="npm install" />
     <Exec Command="node node_modules/webpack/bin/webpack.js --config webpack.config.vendor.js --env.prod" />
     <Exec Command="node node_modules/webpack/bin/webpack.js --env.prod" />
+    <Exec Command="node node_modules/gulp/bin/gulp.js" />
 
     <!-- Include the newly-built files in the publish output -->
     <ItemGroup>
diff --git a/src/Server/Coderr.Server.Web/Views/Shared/_Layout.cshtml b/src/Server/Coderr.Server.Web/Views/Shared/_Layout.cshtml
index aa5a712a..79fba814 100644
--- a/src/Server/Coderr.Server.Web/Views/Shared/_Layout.cshtml
+++ b/src/Server/Coderr.Server.Web/Views/Shared/_Layout.cshtml
@@ -8,6 +8,7 @@
     <link rel="stylesheet" href="~/dist/css/bootstrap-coderr.css" />
     <link rel="stylesheet" href="~/dist/css/site.css" />
     <link rel="stylesheet" href="~/dist/css/common.css" />
+    <link rel="stylesheet" href="~/dist/site.css" />
     <link href="~/css/fontawesome-all.min.css" rel="stylesheet">
     <link href="~/css/toastr.min.css" rel="stylesheet">
     <link rel="apple-touch-icon" sizes="180x180" href="~/apple-touch-icon.png">
diff --git a/src/Server/Coderr.Server.Web/wwwroot/scss/site.scss b/src/Server/Coderr.Server.Web/wwwroot/scss/site.scss
index d553b2de..8c115504 100644
--- a/src/Server/Coderr.Server.Web/wwwroot/scss/site.scss
+++ b/src/Server/Coderr.Server.Web/wwwroot/scss/site.scss
@@ -1,6 +1,25 @@
 @import "coderr-variables.scss";
 @import "mixins/_breakpoints.scss";
 
+.minimal-gutters {
+    margin-right: 1px;
+    margin-left: 1px;
+}
+
+.minimal-gutters > .col,
+.minimal-gutters > [class*="col-"] {
+    padding-right: 1px;
+    padding-left: 1px;
+}
+
+.minimal-gutters .card{
+    margin-bottom: 1px;
+}
+
+.card .card-body ul {
+    padding-left: 10px;
+}
+
 .card-header h3 {
     color: $blue;
 }