Index: branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Query/Results.aspx
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Query/Results.aspx	(revision 5977)
+++ branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Query/Results.aspx	(revision 6076)
@@ -1,5 +1,3 @@
-﻿<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %>
-<%@ Register Src="~/Views/Query/RunCollectionTable.ascx" TagName="RunCollectionTable" TagPrefix="HL" %>
-<%@ Register Src="~/Views/Query/RunCollectionDetail.ascx" TagName="RunCollectionDetail" TagPrefix="HL" %>
+﻿<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" ViewStateMode="Enabled" EnableEventValidation="true"  %>
 
 <asp:Content ID="Content3" runat="server" ContentPlaceHolderID="SubMenuContent">
@@ -15,11 +13,6 @@
     <h2>Results</h2>
     
-    <h3>Test table element</h3>
-    <form runat="server">
-        <HL:RunCollectionTable ID="kurt" runat="server" />
-    </form>
+        <% Html.RenderAction("RunCollectionTable"); %>
 
-    <h3>Test detail element</h3>
-    <HL:RunCollectionDetail ID="sepp" runat="server" />
 
 </asp:Content>
Index: branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Query/RunCollectionData.cs
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Query/RunCollectionData.cs	(revision 5977)
+++ 	(revision )
@@ -1,18 +1,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-using HLWebOKBQueryPlugin.OKBQueryService;
-
-namespace HLWebOKBQueryPlugin.Views.Query {
-    public class RunCollectionData {
-        public string AlgorithmName { get; set; }
-        public string AlgorithmAlgorithmClass { get; set; }
-
-        public RunCollectionData(Run run) {
-            AlgorithmName = run.Algorithm.Name;
-            AlgorithmAlgorithmClass = run.Algorithm.AlgorithmClass;
-        }
-    }
-}
Index: branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Query/RunCollectionDetail.ascx.cs
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Query/RunCollectionDetail.ascx.cs	(revision 5977)
+++ branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Query/RunCollectionDetail.ascx.cs	(revision 6076)
@@ -7,4 +7,6 @@
 
 using System.Reflection;
+
+using HLWebOKBQueryPlugin.Helpers;
 
 namespace HLWebOKBQueryPlugin.Views.Query {
Index: branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Query/RunCollectionTable.ascx
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Query/RunCollectionTable.ascx	(revision 5977)
+++ branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Query/RunCollectionTable.ascx	(revision 6076)
@@ -1,18 +1,19 @@
-﻿<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="RunCollectionTable.ascx.cs" Inherits="HLWebOKBQueryPlugin.Views.Query.RunCollectionTable" %>
+﻿<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
 
-<asp:GridView ID="GridRunCollection" runat="server" AutoGenerateColumns="False" 
-                OnRowCommand="GridRunCollection_RowCommand" 
-                OnSelectedIndexChanged="GridRunCollection_SelectedIndexChanged">
-    <SelectedRowStyle BackColor="Aqua" />
-    <Columns>
-        <asp:BoundField />
-        <asp:CommandField ShowSelectButton="true" SelectText="Details" />
-        <asp:BoundField HeaderText="Abs.DifferenceBestKnown2Best" />
-        <asp:BoundField HeaderText="Algorithm Name" DataField="AlgorithmName" />
-        <asp:BoundField HeaderText="Algorithm Type" DataField="AlgorithmAlgorithmClass" />
-        <asp:BoundField HeaderText="Analyser" />
-    </Columns>
-</asp:GridView>
+<div id="RunCollectionTable" style="overflow: auto; width: 100%">
+    <form id="frmRunCollectionTable" runat="server" method="post">
 
-<asp:TextBox ID="txtTest" runat="server" />
-<asp:TextBox ID="txtTest2" runat="server" />
+        <asp:GridView ID="GridRunCollection" runat="server" DataSourceID="dsQueryRuns">
+            <SelectedRowStyle BackColor="Aqua" />
+            <Columns>
+                <asp:BoundField />
+                <asp:CommandField ShowSelectButton="true" SelectText="Details" />
+            </Columns>
+        </asp:GridView>
+        <asp:ObjectDataSource ID="dsQueryRuns" runat="server" 
+                    SelectMethod="getTestRuns" 
+                    TypeName="HLWebPluginHost.Models.QueryModel">
+        </asp:ObjectDataSource>
+
+    </form>
+</div>
Index: branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Query/RunCollectionTable.ascx.cs
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Query/RunCollectionTable.ascx.cs	(revision 5977)
+++ 	(revision )
@@ -1,66 +1,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-
-using HLWebOKBQueryPlugin.OKBQueryService;
-
-namespace HLWebOKBQueryPlugin.Views.Query {
-    public partial class RunCollectionTable : System.Web.UI.UserControl {
-        public IList<Run> DataRuns { get; set; }
-
-        protected void Page_Load(object sender, EventArgs e) {
-            DataRuns = getTestData();
-
-            IList<RunCollectionData> runsList = new List<RunCollectionData>();
-            foreach (Run r in DataRuns)
-                runsList.Add(new RunCollectionData(r));
-
-            GridRunCollection.DataSource = runsList;
-            GridRunCollection.DataBind();
-
-        }
-
-        private IList<Run> getTestData() {
-            IList<Run> runs = new List<Run>();
-
-            Run run = new Run();
-            run.Id = 34;
-            run.Algorithm = new OKBQueryService.Algorithm();
-            run.Algorithm.Name = "TestAlgo";
-            run.Algorithm.AlgorithmClass = "TestAlgoClass";
-            runs.Add(run);
-
-            run = new Run();
-            run.Id = 35;
-            run.Algorithm = new OKBQueryService.Algorithm();
-            run.Algorithm.Name = "TestAlgo2";
-            run.Algorithm.AlgorithmClass = "TestAlgoClass2";
-            runs.Add(run);
-
-            run = new Run();
-            run.Id = 36;
-            run.Algorithm = new OKBQueryService.Algorithm();
-            run.Algorithm.Name = "TestAlgo3";
-            run.Algorithm.AlgorithmClass = "TestAlgoClass3";
-            runs.Add(run);
-
-            return runs;
-        }
-
-        protected void GridRunCollection_RowCommand(Object sender, GridViewCommandEventArgs e) {
-            txtTest.Text = e.CommandName;
-            if (e.CommandName == "Select") {
-                // TODO gererate Details
-                txtTest.Text = e.CommandName;
-            }
-        }
-
-        protected void GridRunCollection_SelectedIndexChanged(Object sender, EventArgs e) {
-            txtTest2.Text = GridRunCollection.SelectedIndex.ToString();
-        }
-    }
-
-}
Index: branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Query/RunCollectionTable.ascx.designer.cs
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Query/RunCollectionTable.ascx.designer.cs	(revision 5977)
+++ 	(revision )
@@ -1,42 +1,0 @@
-﻿//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated. 
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace HLWebOKBQueryPlugin.Views.Query {
-    
-    
-    public partial class RunCollectionTable {
-        
-        /// <summary>
-        /// GridRunCollection control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.GridView GridRunCollection;
-        
-        /// <summary>
-        /// txtTest control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox txtTest;
-        
-        /// <summary>
-        /// txtTest2 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox txtTest2;
-    }
-}
