Index: branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Views/LoginRequired/Admin.cshtml
===================================================================
--- branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Views/LoginRequired/Admin.cshtml	(revision 11222)
+++ branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Views/LoginRequired/Admin.cshtml	(revision 11246)
@@ -2,11 +2,13 @@
 
 @{
-    ViewBag.Title = "Admin";
-}
-
-@if(!Model.IsAdmin) {
+  ViewBag.Title = "Admin";
+}
+
+@if (!Model.IsAdmin)
+{
   <h1>The user you are logged in as: @Model.UserName, is not an administrator.</h1>
 }
-else {
+else
+{
     <!--[if gte IE 9]>
     <style type="text/css">
@@ -227,7 +229,7 @@
     //User Overview
     function RefreshUser() {
-      CheckFilters("User");
-      @ExceptionHelper.UserExceptions("TasksContainer", Url.Action("TaskExceptions", "ExceptionData"), "limit", "selectedUser", "startDate", "endDate", "jobId", "taskState")
-      @ChartHelper.TasksForUser("TasksContainer",Url.Action("UserTask", "ChartData"), "RefreshUser", "selectedUser", "limit", "startDate", "endDate", "jobId", "taskState", "pageNumber")
+      CheckFilters();
+      @ExceptionHelper.UserExceptions("TasksContainer", Url.Action("TaskExceptions", "ExceptionData"), "selectedUser", "startDate", "endDate", "jobId", "taskState")
+      @ChartHelper.TaskContainers("TasksContainer", Url.Action("GetTasks", "ChartData"), "RefreshUser", "selectedUser", "limit", "startDate", "endDate", "jobId", "taskState", "pageNumber")
       pageNumber = null;
     }
@@ -235,9 +237,10 @@
     //Task Overview
     $("#TaskUserList").change(function () {
+      CheckFilters();
       RefreshTask();
     });
 
     function RefreshTask() {
-      CheckFilters("Task");
+      CheckFilters();
       @AdminHelper.UserTaskStats("TaskStatsContainer", Url.Action("TaskStats", "AdminData"), "selectedUser", "startDate", "endDate")
     }
@@ -245,6 +248,6 @@
     //Slave Overview
     function RefreshSlave() {
-      CheckFilters("Slave");
-      @ChartHelper.SlaveInfoChart("SlavesContainer", Url.Action("SlaveInfo", "ChartData"), "limit", false, "startDate", "endDate", "selectedUser", "RefreshSlave", "pageNumber")
+      CheckFilters();
+      @ChartHelper.SlaveContainers("SlavesContainer", Url.Action("GetSlaves", "ChartData"), "limit", false, "startDate", "endDate", "selectedUser", "RefreshSlave", "pageNumber")
       pageNumber = null;
     }
@@ -256,16 +259,15 @@
 
     function RefreshException() {
-      CheckFilters("Exception");
-      @ExceptionHelper.UserExceptions("ExceptionContainer",Url.Action("TaskExceptions","ExceptionData"),"limit",null,"startDate","endDate",null,null,"selectedSlave")
-      @ExceptionHelper.ErrorsOnSlaves("ExceptionContainer",Url.Action("SlaveExceptions","ExceptionData"),"limit","startDate","endDate","selectedSlave","RefreshException","pageNumber")
-    }
-    @ExceptionHelper.ShowSlaveInfo(Url.Action("SlaveInfo","ChartData"),"limit","startDate","endDate")
+      CheckFilters();
+      @ExceptionHelper.UserExceptions("ExceptionContainer", Url.Action("TaskExceptions", "ExceptionData"), null, "startDate", "endDate", null, null, "selectedSlave")
+      @ExceptionHelper.ErrorsOnSlaves("ExceptionContainer", Url.Action("SlaveExceptions", "ExceptionData"), "limit", "startDate", "endDate", "selectedSlave", "RefreshException", "pageNumber")
+    }
 
     //General Chart Methods
-    function CheckFilters(currentTab) {
+    function CheckFilters() {
       startDate = null;
       endDate = null;
-      switch(currentTab) {
-        case "User":
+      switch($('.tabSection:visible').attr('id')) {
+        case "UserOverviewTab":
           selectedUser = $("#UserList").val();
           jobId = null;
@@ -283,10 +285,10 @@
           }
           break;
-        case "Task":
+        case "TaskOverviewTab":
           selectedUser = $("#TaskUserList").val();
           startDate = $('#TaskStart').val();
           endDate = $('#TaskEnd').val();
           break;
-        case "Slave":
+        case "SlaveOverviewTab":
           selectedUser = null;
           limit = $("#SlaveLimit").val();
@@ -299,6 +301,7 @@
           }
           break;
-        case "Exception":
+        case "ExceptionOverviewTab":
           selectedSlave = null;
+          selectedUser = null;
           limit = $("#ExceptionLimit").val();
           if ($("[value='ExceptionDate']").is(":checked")) {
@@ -313,7 +316,12 @@
 
     @ChartHelper.ResizeCharts()
+    @ChartHelper.LoadTask(Url.Action("TaskInfo", "ChartData"))
+    @ChartHelper.LoadJob(Url.Action("JobProgress", "ChartData"))
+    @ChartHelper.LoadSlave(Url.Action("SlaveInfo", "ChartData"), "limit", "startDate", "endDate", "selectedUser", "pageNumber")
     @ExceptionHelper.ScrollToException()
-    @AdminHelper.MoreTaskInfo(Url.Action("MoreTaskInfo","AdminData"))
-    @AdminHelper.MoreSlaveInfo(Url.Action("MoreSlaveInfo","AdminData"))
+    @ExceptionHelper.ShowFullError()
+    @ExceptionHelper.ShowSlaveInfo(Url.Action("GetSlaves", "ChartData"), "limit", "startDate", "endDate")
+    @AdminHelper.MoreTaskInfo(Url.Action("MoreTaskInfo", "AdminData"))
+    @AdminHelper.MoreSlaveInfo(Url.Action("MoreSlaveInfo", "AdminData"), "startDate", "endDate")
   </script>
 }
Index: branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Views/LoginRequired/UserTask.cshtml
===================================================================
--- branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Views/LoginRequired/UserTask.cshtml	(revision 11222)
+++ branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Views/LoginRequired/UserTask.cshtml	(revision 11246)
@@ -114,27 +114,12 @@
 
     function TaskInformation() {
-      limit = $('#Limit').val();
-      startDate = null;
-      endDate = null;
-      jobId = null;
-      taskState = null;
-      if ($("[value='Date']").is(":checked")) {
-        startDate = $('#InfoStart').val();
-        endDate = $('#InfoEnd').val();
-      }
-      if ($("[value='JobName']").is(':checked')) {
-        jobId = $('#JobNames').val();
-      }
-      if ($("[value='TaskState']").is(':checked')) {
-        taskState = $('#TaskStates').val();
-      }
-      @ExceptionHelper.UserExceptions("TasksContainer",Url.Action("TaskExceptions", "ExceptionData"),"limit","userName","startDate","endDate","jobId","taskState")
-      @ChartHelper.TasksForUser("TasksContainer",Url.Action("UserTask", "ChartData"),"TaskInformation","userName","limit","startDate","endDate","jobId","taskState","pageNumber")
+      CheckFilters();
+      @ExceptionHelper.UserExceptions("TasksContainer",Url.Action("TaskExceptions", "ExceptionData"),"userName","startDate","endDate","jobId","taskState")
+      @ChartHelper.TaskContainers("TasksContainer",Url.Action("GetTasks", "ChartData"),"TaskInformation","userName","limit","startDate","endDate","jobId","taskState","pageNumber")
       pageNumber = null;
     }
 
     function TaskOverview() {
-      startDate = $('#OverviewStart').val();
-      endDate = $('#OverviewEnd').val();
+      CheckFilters();
       @AdminHelper.UserTaskStats("TaskStatsContainer",Url.Action("TaskStats", "AdminData"),"userName","startDate","endDate")
     }
@@ -148,7 +133,36 @@
     })
 
+    //General Chart Methods
+    function CheckFilters() {
+      startDate = null;
+      endDate = null;
+      switch ($('.tabSection:visible').attr('id')) {
+        case "TaskInformationTab":
+          limit = $('#Limit').val();
+          jobId = null;
+          taskState = null;
+          if ($("[value='Date']").is(":checked")) {
+            startDate = $('#InfoStart').val();
+            endDate = $('#InfoEnd').val();
+          }
+          if ($("[value='JobName']").is(':checked')) {
+            jobId = $('#JobNames').val();
+          }
+          if ($("[value='TaskState']").is(':checked')) {
+            taskState = $('#TaskStates').val();
+          }
+          break;
+        case "TaskOverviewTab":
+          startDate = $('#OverviewStart').val();
+          endDate = $('#OverviewEnd').val();
+          break;
+      }
+    }
     TaskInformation();
     @ChartHelper.ResizeCharts()
+    @ChartHelper.LoadTask(Url.Action("TaskInfo", "ChartData"))
+    @ChartHelper.LoadJob(Url.Action("JobProgress", "ChartData"))
     @ExceptionHelper.ScrollToException()
+    @ExceptionHelper.ShowFullError()
     @AdminHelper.MoreTaskInfo(Url.Action("MoreTaskInfo","AdminData"))
   </script>
