diff --git a/LICENCE.txt b/LICENCE.txt
new file mode 100644
index 0000000..edbd3f4
--- /dev/null
+++ b/LICENCE.txt
@@ -0,0 +1,19 @@
+Copyright (c) 2012, Rien Nentjes
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file

diff --git a/LICENCE.txt b/LICENCE.txt
new file mode 100644
index 0000000..edbd3f4
--- /dev/null
+++ b/LICENCE.txt
@@ -0,0 +1,19 @@
+Copyright (c) 2012, Rien Nentjes
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file
diff --git a/src/nl/astraeus/jdbc/JdbcLogger.java b/src/nl/astraeus/jdbc/JdbcLogger.java
index 08e525d..e9cc338 100644
--- a/src/nl/astraeus/jdbc/JdbcLogger.java
+++ b/src/nl/astraeus/jdbc/JdbcLogger.java
@@ -112,7 +112,7 @@
         }
 
         public String getSql() {
-            if (Settings.get().isFormattedQueries()) {
+            if (JdbcLogger.get().isFormattedQueries()) {
                 return SqlFormatter.getHTMLFormattedSQL(sql);
             } else {
                 return sql;
@@ -153,6 +153,9 @@
     private final List<LogEntry> queries;
     private long startTime;
     private boolean recording = false;
+    
+    private int numberOfQueries = 2500;
+    private boolean formattedQueries = true;
 
     public JdbcLogger() {
         queries = new LinkedList<LogEntry>();
@@ -187,7 +190,7 @@
         synchronized (queries) {
             queries.add(entry);
 
-            while (queries.size() > Settings.get().getNumberOfQueries()) {
+            while (queries.size() > getNumberOfQueries()) {
                 entry = queries.remove(0);
                 startTime = entry.getMilli();
             }
@@ -204,4 +207,19 @@
         }
     }
 
+    public int getNumberOfQueries() {
+        return numberOfQueries;
+    }
+
+    public void setNumberOfQueries(int numberOfQueries) {
+        this.numberOfQueries = numberOfQueries;
+    }
+
+    public boolean isFormattedQueries() {
+        return formattedQueries;
+    }
+
+    public void setFormattedQueries(boolean formattedQueries) {
+        this.formattedQueries = formattedQueries;
+    }
 }

diff --git a/LICENCE.txt b/LICENCE.txt
new file mode 100644
index 0000000..edbd3f4
--- /dev/null
+++ b/LICENCE.txt
@@ -0,0 +1,19 @@
+Copyright (c) 2012, Rien Nentjes
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file
diff --git a/src/nl/astraeus/jdbc/JdbcLogger.java b/src/nl/astraeus/jdbc/JdbcLogger.java
index 08e525d..e9cc338 100644
--- a/src/nl/astraeus/jdbc/JdbcLogger.java
+++ b/src/nl/astraeus/jdbc/JdbcLogger.java
@@ -112,7 +112,7 @@
         }
 
         public String getSql() {
-            if (Settings.get().isFormattedQueries()) {
+            if (JdbcLogger.get().isFormattedQueries()) {
                 return SqlFormatter.getHTMLFormattedSQL(sql);
             } else {
                 return sql;
@@ -153,6 +153,9 @@
     private final List<LogEntry> queries;
     private long startTime;
     private boolean recording = false;
+    
+    private int numberOfQueries = 2500;
+    private boolean formattedQueries = true;
 
     public JdbcLogger() {
         queries = new LinkedList<LogEntry>();
@@ -187,7 +190,7 @@
         synchronized (queries) {
             queries.add(entry);
 
-            while (queries.size() > Settings.get().getNumberOfQueries()) {
+            while (queries.size() > getNumberOfQueries()) {
                 entry = queries.remove(0);
                 startTime = entry.getMilli();
             }
@@ -204,4 +207,19 @@
         }
     }
 
+    public int getNumberOfQueries() {
+        return numberOfQueries;
+    }
+
+    public void setNumberOfQueries(int numberOfQueries) {
+        this.numberOfQueries = numberOfQueries;
+    }
+
+    public boolean isFormattedQueries() {
+        return formattedQueries;
+    }
+
+    public void setFormattedQueries(boolean formattedQueries) {
+        this.formattedQueries = formattedQueries;
+    }
 }
diff --git a/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java b/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
index 08eb817..96690ba 100644
--- a/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
+++ b/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
@@ -79,6 +79,7 @@
         boolean ajax = "true".equals(req.getParameter("ajax"));
 
         resp.setContentType("text/html");
+
         Settings.get().readSettings(req);
 
         Page page = (Page)session.getAttribute("page");
@@ -120,7 +121,9 @@
         resp.getWriter().print(Warnings.get(req).render(req));
 
         long time = System.nanoTime();
+        resp.getWriter().println("<div class=\"container-fluid\">");
         resp.getWriter().print(page.render(req));
+        resp.getWriter().println("</div>");
 
         Settings.get().saveSettings(resp);
 

diff --git a/LICENCE.txt b/LICENCE.txt
new file mode 100644
index 0000000..edbd3f4
--- /dev/null
+++ b/LICENCE.txt
@@ -0,0 +1,19 @@
+Copyright (c) 2012, Rien Nentjes
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file
diff --git a/src/nl/astraeus/jdbc/JdbcLogger.java b/src/nl/astraeus/jdbc/JdbcLogger.java
index 08e525d..e9cc338 100644
--- a/src/nl/astraeus/jdbc/JdbcLogger.java
+++ b/src/nl/astraeus/jdbc/JdbcLogger.java
@@ -112,7 +112,7 @@
         }
 
         public String getSql() {
-            if (Settings.get().isFormattedQueries()) {
+            if (JdbcLogger.get().isFormattedQueries()) {
                 return SqlFormatter.getHTMLFormattedSQL(sql);
             } else {
                 return sql;
@@ -153,6 +153,9 @@
     private final List<LogEntry> queries;
     private long startTime;
     private boolean recording = false;
+    
+    private int numberOfQueries = 2500;
+    private boolean formattedQueries = true;
 
     public JdbcLogger() {
         queries = new LinkedList<LogEntry>();
@@ -187,7 +190,7 @@
         synchronized (queries) {
             queries.add(entry);
 
-            while (queries.size() > Settings.get().getNumberOfQueries()) {
+            while (queries.size() > getNumberOfQueries()) {
                 entry = queries.remove(0);
                 startTime = entry.getMilli();
             }
@@ -204,4 +207,19 @@
         }
     }
 
+    public int getNumberOfQueries() {
+        return numberOfQueries;
+    }
+
+    public void setNumberOfQueries(int numberOfQueries) {
+        this.numberOfQueries = numberOfQueries;
+    }
+
+    public boolean isFormattedQueries() {
+        return formattedQueries;
+    }
+
+    public void setFormattedQueries(boolean formattedQueries) {
+        this.formattedQueries = formattedQueries;
+    }
 }
diff --git a/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java b/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
index 08eb817..96690ba 100644
--- a/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
+++ b/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
@@ -79,6 +79,7 @@
         boolean ajax = "true".equals(req.getParameter("ajax"));
 
         resp.setContentType("text/html");
+
         Settings.get().readSettings(req);
 
         Page page = (Page)session.getAttribute("page");
@@ -120,7 +121,9 @@
         resp.getWriter().print(Warnings.get(req).render(req));
 
         long time = System.nanoTime();
+        resp.getWriter().println("<div class=\"container-fluid\">");
         resp.getWriter().print(page.render(req));
+        resp.getWriter().println("</div>");
 
         Settings.get().saveSettings(resp);
 
diff --git a/src/nl/astraeus/jdbc/web/bottom.html b/src/nl/astraeus/jdbc/web/bottom.html
index 1288de4..955c589 100644
--- a/src/nl/astraeus/jdbc/web/bottom.html
+++ b/src/nl/astraeus/jdbc/web/bottom.html
@@ -1,8 +1,18 @@
-</form>
+    </div>
+  </form>
 
-</div>
 
+<div id="loading"></div>
+
+<script type="text/javascript" src="resources/js/bootstrap-transition.js"></script>
 <script type="text/javascript" src="resources/js/bootstrap-dropdown.js"></script>
+<script type="text/javascript" src="resources/js/bootstrap-collapse.js"></script>
+
+    <script type="text/javascript" src="https://www.google.com/jsapi"></script>
+
+    <script type="text/javascript">
+        google.load('visualization', '1', {'packages':['corechart']});
+    </script>
 
 </body>
 </html>
\ No newline at end of file

diff --git a/LICENCE.txt b/LICENCE.txt
new file mode 100644
index 0000000..edbd3f4
--- /dev/null
+++ b/LICENCE.txt
@@ -0,0 +1,19 @@
+Copyright (c) 2012, Rien Nentjes
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file
diff --git a/src/nl/astraeus/jdbc/JdbcLogger.java b/src/nl/astraeus/jdbc/JdbcLogger.java
index 08e525d..e9cc338 100644
--- a/src/nl/astraeus/jdbc/JdbcLogger.java
+++ b/src/nl/astraeus/jdbc/JdbcLogger.java
@@ -112,7 +112,7 @@
         }
 
         public String getSql() {
-            if (Settings.get().isFormattedQueries()) {
+            if (JdbcLogger.get().isFormattedQueries()) {
                 return SqlFormatter.getHTMLFormattedSQL(sql);
             } else {
                 return sql;
@@ -153,6 +153,9 @@
     private final List<LogEntry> queries;
     private long startTime;
     private boolean recording = false;
+    
+    private int numberOfQueries = 2500;
+    private boolean formattedQueries = true;
 
     public JdbcLogger() {
         queries = new LinkedList<LogEntry>();
@@ -187,7 +190,7 @@
         synchronized (queries) {
             queries.add(entry);
 
-            while (queries.size() > Settings.get().getNumberOfQueries()) {
+            while (queries.size() > getNumberOfQueries()) {
                 entry = queries.remove(0);
                 startTime = entry.getMilli();
             }
@@ -204,4 +207,19 @@
         }
     }
 
+    public int getNumberOfQueries() {
+        return numberOfQueries;
+    }
+
+    public void setNumberOfQueries(int numberOfQueries) {
+        this.numberOfQueries = numberOfQueries;
+    }
+
+    public boolean isFormattedQueries() {
+        return formattedQueries;
+    }
+
+    public void setFormattedQueries(boolean formattedQueries) {
+        this.formattedQueries = formattedQueries;
+    }
 }
diff --git a/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java b/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
index 08eb817..96690ba 100644
--- a/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
+++ b/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
@@ -79,6 +79,7 @@
         boolean ajax = "true".equals(req.getParameter("ajax"));
 
         resp.setContentType("text/html");
+
         Settings.get().readSettings(req);
 
         Page page = (Page)session.getAttribute("page");
@@ -120,7 +121,9 @@
         resp.getWriter().print(Warnings.get(req).render(req));
 
         long time = System.nanoTime();
+        resp.getWriter().println("<div class=\"container-fluid\">");
         resp.getWriter().print(page.render(req));
+        resp.getWriter().println("</div>");
 
         Settings.get().saveSettings(resp);
 
diff --git a/src/nl/astraeus/jdbc/web/bottom.html b/src/nl/astraeus/jdbc/web/bottom.html
index 1288de4..955c589 100644
--- a/src/nl/astraeus/jdbc/web/bottom.html
+++ b/src/nl/astraeus/jdbc/web/bottom.html
@@ -1,8 +1,18 @@
-</form>
+    </div>
+  </form>
 
-</div>
 
+<div id="loading"></div>
+
+<script type="text/javascript" src="resources/js/bootstrap-transition.js"></script>
 <script type="text/javascript" src="resources/js/bootstrap-dropdown.js"></script>
+<script type="text/javascript" src="resources/js/bootstrap-collapse.js"></script>
+
+    <script type="text/javascript" src="https://www.google.com/jsapi"></script>
+
+    <script type="text/javascript">
+        google.load('visualization', '1', {'packages':['corechart']});
+    </script>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/src/nl/astraeus/jdbc/web/head.html b/src/nl/astraeus/jdbc/web/head.html
index 54d9cb8..c99b11e 100644
--- a/src/nl/astraeus/jdbc/web/head.html
+++ b/src/nl/astraeus/jdbc/web/head.html
@@ -11,66 +11,16 @@
     <meta name="author" content="">
 
     <link href="resources/css/bootstrap.css" rel="stylesheet">
+    <link href="resources/css/jdbc-stats.css" rel="stylesheet">
     <link href="resources/css/bootstrap-responsive.css" rel="stylesheet">
 
-    <style type="text/css">
-        html, body {
-            padding: 0;
-            margin: 0;
-            width: 100%;
-            height: 95%;
-        }
-
-        body {
-            padding-top: 50px;
-        }
-
-        div#loading {
-            /*make invisible*/
-            display:none;
-            z-index:9999;
-
-            position:absolute;
-            top:0;
-            left:0;
-            width:100%;
-            height: 90%;
-            text-align:center;
-
-            /*in supporting browsers, make it
-          a little transparent*/
-            background: #fff url('/resources/images/loading.gif');
-            background-repeat:no-repeat;
-            background-attachment:fixed;
-            background-position:center;
-
-            _background: none; /*this line removes the background in IE*/
-            opacity:.5;
-            border-top: 0 solid #ddd;
-            border-bottom: 0 solid #ddd;
-
-            /*set the padding, so that the content
-       of the div is centered vertically*/
-            padding-top:0%;
-        }
-
-        code.sql {
-            color: black;
-            font-weight: bold
-        }
-        code.sql b {
-            color: blue;
-            /*font-weight: normal;*/
-        }
-    </style>
-
-    <script type="text/javascript" src="resources/js/jquery.js"></script>
-
     <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>
     <script type="text/javascript" src="resources/js/html5.js"></script>
     <![endif]-->
 
+    <script type="text/javascript" src="resources/js/jquery.js"></script>
+
     <script type="text/javascript">
         function submit(action, actionValue) {
             var params = 'ajax=true&action=' + action + '&actionValue=' + actionValue + '&' + $("#form").serialize();
@@ -98,8 +48,5 @@
 
 </head>
 <body>
-<div id="loading"></div>
-<form name="form" id="form" action="/" method="post" class="form-horizontal">
-
-    <div class="container" id="content">
-
+  <form name="form" id="form" action="/" method="post" class="form-horizontal">
+    <div id="content">

diff --git a/LICENCE.txt b/LICENCE.txt
new file mode 100644
index 0000000..edbd3f4
--- /dev/null
+++ b/LICENCE.txt
@@ -0,0 +1,19 @@
+Copyright (c) 2012, Rien Nentjes
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file
diff --git a/src/nl/astraeus/jdbc/JdbcLogger.java b/src/nl/astraeus/jdbc/JdbcLogger.java
index 08e525d..e9cc338 100644
--- a/src/nl/astraeus/jdbc/JdbcLogger.java
+++ b/src/nl/astraeus/jdbc/JdbcLogger.java
@@ -112,7 +112,7 @@
         }
 
         public String getSql() {
-            if (Settings.get().isFormattedQueries()) {
+            if (JdbcLogger.get().isFormattedQueries()) {
                 return SqlFormatter.getHTMLFormattedSQL(sql);
             } else {
                 return sql;
@@ -153,6 +153,9 @@
     private final List<LogEntry> queries;
     private long startTime;
     private boolean recording = false;
+    
+    private int numberOfQueries = 2500;
+    private boolean formattedQueries = true;
 
     public JdbcLogger() {
         queries = new LinkedList<LogEntry>();
@@ -187,7 +190,7 @@
         synchronized (queries) {
             queries.add(entry);
 
-            while (queries.size() > Settings.get().getNumberOfQueries()) {
+            while (queries.size() > getNumberOfQueries()) {
                 entry = queries.remove(0);
                 startTime = entry.getMilli();
             }
@@ -204,4 +207,19 @@
         }
     }
 
+    public int getNumberOfQueries() {
+        return numberOfQueries;
+    }
+
+    public void setNumberOfQueries(int numberOfQueries) {
+        this.numberOfQueries = numberOfQueries;
+    }
+
+    public boolean isFormattedQueries() {
+        return formattedQueries;
+    }
+
+    public void setFormattedQueries(boolean formattedQueries) {
+        this.formattedQueries = formattedQueries;
+    }
 }
diff --git a/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java b/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
index 08eb817..96690ba 100644
--- a/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
+++ b/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
@@ -79,6 +79,7 @@
         boolean ajax = "true".equals(req.getParameter("ajax"));
 
         resp.setContentType("text/html");
+
         Settings.get().readSettings(req);
 
         Page page = (Page)session.getAttribute("page");
@@ -120,7 +121,9 @@
         resp.getWriter().print(Warnings.get(req).render(req));
 
         long time = System.nanoTime();
+        resp.getWriter().println("<div class=\"container-fluid\">");
         resp.getWriter().print(page.render(req));
+        resp.getWriter().println("</div>");
 
         Settings.get().saveSettings(resp);
 
diff --git a/src/nl/astraeus/jdbc/web/bottom.html b/src/nl/astraeus/jdbc/web/bottom.html
index 1288de4..955c589 100644
--- a/src/nl/astraeus/jdbc/web/bottom.html
+++ b/src/nl/astraeus/jdbc/web/bottom.html
@@ -1,8 +1,18 @@
-</form>
+    </div>
+  </form>
 
-</div>
 
+<div id="loading"></div>
+
+<script type="text/javascript" src="resources/js/bootstrap-transition.js"></script>
 <script type="text/javascript" src="resources/js/bootstrap-dropdown.js"></script>
+<script type="text/javascript" src="resources/js/bootstrap-collapse.js"></script>
+
+    <script type="text/javascript" src="https://www.google.com/jsapi"></script>
+
+    <script type="text/javascript">
+        google.load('visualization', '1', {'packages':['corechart']});
+    </script>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/src/nl/astraeus/jdbc/web/head.html b/src/nl/astraeus/jdbc/web/head.html
index 54d9cb8..c99b11e 100644
--- a/src/nl/astraeus/jdbc/web/head.html
+++ b/src/nl/astraeus/jdbc/web/head.html
@@ -11,66 +11,16 @@
     <meta name="author" content="">
 
     <link href="resources/css/bootstrap.css" rel="stylesheet">
+    <link href="resources/css/jdbc-stats.css" rel="stylesheet">
     <link href="resources/css/bootstrap-responsive.css" rel="stylesheet">
 
-    <style type="text/css">
-        html, body {
-            padding: 0;
-            margin: 0;
-            width: 100%;
-            height: 95%;
-        }
-
-        body {
-            padding-top: 50px;
-        }
-
-        div#loading {
-            /*make invisible*/
-            display:none;
-            z-index:9999;
-
-            position:absolute;
-            top:0;
-            left:0;
-            width:100%;
-            height: 90%;
-            text-align:center;
-
-            /*in supporting browsers, make it
-          a little transparent*/
-            background: #fff url('/resources/images/loading.gif');
-            background-repeat:no-repeat;
-            background-attachment:fixed;
-            background-position:center;
-
-            _background: none; /*this line removes the background in IE*/
-            opacity:.5;
-            border-top: 0 solid #ddd;
-            border-bottom: 0 solid #ddd;
-
-            /*set the padding, so that the content
-       of the div is centered vertically*/
-            padding-top:0%;
-        }
-
-        code.sql {
-            color: black;
-            font-weight: bold
-        }
-        code.sql b {
-            color: blue;
-            /*font-weight: normal;*/
-        }
-    </style>
-
-    <script type="text/javascript" src="resources/js/jquery.js"></script>
-
     <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>
     <script type="text/javascript" src="resources/js/html5.js"></script>
     <![endif]-->
 
+    <script type="text/javascript" src="resources/js/jquery.js"></script>
+
     <script type="text/javascript">
         function submit(action, actionValue) {
             var params = 'ajax=true&action=' + action + '&actionValue=' + actionValue + '&' + $("#form").serialize();
@@ -98,8 +48,5 @@
 
 </head>
 <body>
-<div id="loading"></div>
-<form name="form" id="form" action="/" method="post" class="form-horizontal">
-
-    <div class="container" id="content">
-
+  <form name="form" id="form" action="/" method="post" class="form-horizontal">
+    <div id="content">
diff --git a/src/nl/astraeus/jdbc/web/page/Menu.html b/src/nl/astraeus/jdbc/web/page/Menu.html
index 8c3ea7c..3e8d139 100644
--- a/src/nl/astraeus/jdbc/web/page/Menu.html
+++ b/src/nl/astraeus/jdbc/web/page/Menu.html
@@ -1,6 +1,6 @@
 <div id="topmenu" class="navbar navbar-fixed-top" >
     <div class="navbar-inner">
-        <div class="container">
+        <div class="container-fluid">
             <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>

diff --git a/LICENCE.txt b/LICENCE.txt
new file mode 100644
index 0000000..edbd3f4
--- /dev/null
+++ b/LICENCE.txt
@@ -0,0 +1,19 @@
+Copyright (c) 2012, Rien Nentjes
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file
diff --git a/src/nl/astraeus/jdbc/JdbcLogger.java b/src/nl/astraeus/jdbc/JdbcLogger.java
index 08e525d..e9cc338 100644
--- a/src/nl/astraeus/jdbc/JdbcLogger.java
+++ b/src/nl/astraeus/jdbc/JdbcLogger.java
@@ -112,7 +112,7 @@
         }
 
         public String getSql() {
-            if (Settings.get().isFormattedQueries()) {
+            if (JdbcLogger.get().isFormattedQueries()) {
                 return SqlFormatter.getHTMLFormattedSQL(sql);
             } else {
                 return sql;
@@ -153,6 +153,9 @@
     private final List<LogEntry> queries;
     private long startTime;
     private boolean recording = false;
+    
+    private int numberOfQueries = 2500;
+    private boolean formattedQueries = true;
 
     public JdbcLogger() {
         queries = new LinkedList<LogEntry>();
@@ -187,7 +190,7 @@
         synchronized (queries) {
             queries.add(entry);
 
-            while (queries.size() > Settings.get().getNumberOfQueries()) {
+            while (queries.size() > getNumberOfQueries()) {
                 entry = queries.remove(0);
                 startTime = entry.getMilli();
             }
@@ -204,4 +207,19 @@
         }
     }
 
+    public int getNumberOfQueries() {
+        return numberOfQueries;
+    }
+
+    public void setNumberOfQueries(int numberOfQueries) {
+        this.numberOfQueries = numberOfQueries;
+    }
+
+    public boolean isFormattedQueries() {
+        return formattedQueries;
+    }
+
+    public void setFormattedQueries(boolean formattedQueries) {
+        this.formattedQueries = formattedQueries;
+    }
 }
diff --git a/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java b/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
index 08eb817..96690ba 100644
--- a/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
+++ b/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
@@ -79,6 +79,7 @@
         boolean ajax = "true".equals(req.getParameter("ajax"));
 
         resp.setContentType("text/html");
+
         Settings.get().readSettings(req);
 
         Page page = (Page)session.getAttribute("page");
@@ -120,7 +121,9 @@
         resp.getWriter().print(Warnings.get(req).render(req));
 
         long time = System.nanoTime();
+        resp.getWriter().println("<div class=\"container-fluid\">");
         resp.getWriter().print(page.render(req));
+        resp.getWriter().println("</div>");
 
         Settings.get().saveSettings(resp);
 
diff --git a/src/nl/astraeus/jdbc/web/bottom.html b/src/nl/astraeus/jdbc/web/bottom.html
index 1288de4..955c589 100644
--- a/src/nl/astraeus/jdbc/web/bottom.html
+++ b/src/nl/astraeus/jdbc/web/bottom.html
@@ -1,8 +1,18 @@
-</form>
+    </div>
+  </form>
 
-</div>
 
+<div id="loading"></div>
+
+<script type="text/javascript" src="resources/js/bootstrap-transition.js"></script>
 <script type="text/javascript" src="resources/js/bootstrap-dropdown.js"></script>
+<script type="text/javascript" src="resources/js/bootstrap-collapse.js"></script>
+
+    <script type="text/javascript" src="https://www.google.com/jsapi"></script>
+
+    <script type="text/javascript">
+        google.load('visualization', '1', {'packages':['corechart']});
+    </script>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/src/nl/astraeus/jdbc/web/head.html b/src/nl/astraeus/jdbc/web/head.html
index 54d9cb8..c99b11e 100644
--- a/src/nl/astraeus/jdbc/web/head.html
+++ b/src/nl/astraeus/jdbc/web/head.html
@@ -11,66 +11,16 @@
     <meta name="author" content="">
 
     <link href="resources/css/bootstrap.css" rel="stylesheet">
+    <link href="resources/css/jdbc-stats.css" rel="stylesheet">
     <link href="resources/css/bootstrap-responsive.css" rel="stylesheet">
 
-    <style type="text/css">
-        html, body {
-            padding: 0;
-            margin: 0;
-            width: 100%;
-            height: 95%;
-        }
-
-        body {
-            padding-top: 50px;
-        }
-
-        div#loading {
-            /*make invisible*/
-            display:none;
-            z-index:9999;
-
-            position:absolute;
-            top:0;
-            left:0;
-            width:100%;
-            height: 90%;
-            text-align:center;
-
-            /*in supporting browsers, make it
-          a little transparent*/
-            background: #fff url('/resources/images/loading.gif');
-            background-repeat:no-repeat;
-            background-attachment:fixed;
-            background-position:center;
-
-            _background: none; /*this line removes the background in IE*/
-            opacity:.5;
-            border-top: 0 solid #ddd;
-            border-bottom: 0 solid #ddd;
-
-            /*set the padding, so that the content
-       of the div is centered vertically*/
-            padding-top:0%;
-        }
-
-        code.sql {
-            color: black;
-            font-weight: bold
-        }
-        code.sql b {
-            color: blue;
-            /*font-weight: normal;*/
-        }
-    </style>
-
-    <script type="text/javascript" src="resources/js/jquery.js"></script>
-
     <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>
     <script type="text/javascript" src="resources/js/html5.js"></script>
     <![endif]-->
 
+    <script type="text/javascript" src="resources/js/jquery.js"></script>
+
     <script type="text/javascript">
         function submit(action, actionValue) {
             var params = 'ajax=true&action=' + action + '&actionValue=' + actionValue + '&' + $("#form").serialize();
@@ -98,8 +48,5 @@
 
 </head>
 <body>
-<div id="loading"></div>
-<form name="form" id="form" action="/" method="post" class="form-horizontal">
-
-    <div class="container" id="content">
-
+  <form name="form" id="form" action="/" method="post" class="form-horizontal">
+    <div id="content">
diff --git a/src/nl/astraeus/jdbc/web/page/Menu.html b/src/nl/astraeus/jdbc/web/page/Menu.html
index 8c3ea7c..3e8d139 100644
--- a/src/nl/astraeus/jdbc/web/page/Menu.html
+++ b/src/nl/astraeus/jdbc/web/page/Menu.html
@@ -1,6 +1,6 @@
 <div id="topmenu" class="navbar navbar-fixed-top" >
     <div class="navbar-inner">
-        <div class="container">
+        <div class="container-fluid">
             <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
diff --git a/src/nl/astraeus/jdbc/web/page/SettingsOverview.java b/src/nl/astraeus/jdbc/web/page/SettingsOverview.java
index 23a8ddd..6d85122 100644
--- a/src/nl/astraeus/jdbc/web/page/SettingsOverview.java
+++ b/src/nl/astraeus/jdbc/web/page/SettingsOverview.java
@@ -1,5 +1,6 @@
 package nl.astraeus.jdbc.web.page;
 
+import nl.astraeus.jdbc.JdbcLogger;
 import nl.astraeus.jdbc.web.model.Settings;
 
 import javax.servlet.http.HttpServletRequest;
@@ -17,19 +18,24 @@
     public Page processRequest(HttpServletRequest request) {
         Page result = this;
 
+        Settings settings = Settings.get();
+
         if ("save".equals(request.getParameter("action"))) {
             String nrq = request.getParameter("queries");
             String pq = request.getParameter("formattedQueries");
 
             if (nrq != null) {
-                Settings.get().setNumberOfQueries(Integer.parseInt(nrq));
+                settings.setNumberOfQueries(Integer.parseInt(nrq));
             }
 
             if (pq != null) {
-                Settings.get().setFormattedQueries(true);
+                settings.setFormattedQueries(true);
             } else {
-                Settings.get().setFormattedQueries(false);
+                settings.setFormattedQueries(false);
             }
+
+            JdbcLogger.get().setNumberOfQueries(settings.getNumberOfQueries());
+            JdbcLogger.get().setFormattedQueries(settings.isFormattedQueries());
             
             Warnings.get(request).addMessage(Warnings.Message.Type.SUCCESS, "Success!", "Settings are successfully saved.");
         }
@@ -40,8 +46,9 @@
     @Override
     public Map<String, Object> defineModel(HttpServletRequest request) {
         Map<String, Object> result = new HashMap<String, Object>();
+        Settings settings = Settings.get();
 
-        int nrq = Settings.get().getNumberOfQueries();
+        int nrq = settings.getNumberOfQueries();
         result.put("q1000", nrq == 1000);
         result.put("q2500", nrq == 2500);
         result.put("q5000", nrq == 5000);
@@ -49,7 +56,7 @@
         result.put("q15000", nrq == 15000);
         result.put("q25000", nrq == 25000);
 
-        result.put("formattedQueries", Settings.get().isFormattedQueries());
+        result.put("formattedQueries", settings.isFormattedQueries());
 
         return result;
     }

diff --git a/LICENCE.txt b/LICENCE.txt
new file mode 100644
index 0000000..edbd3f4
--- /dev/null
+++ b/LICENCE.txt
@@ -0,0 +1,19 @@
+Copyright (c) 2012, Rien Nentjes
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file
diff --git a/src/nl/astraeus/jdbc/JdbcLogger.java b/src/nl/astraeus/jdbc/JdbcLogger.java
index 08e525d..e9cc338 100644
--- a/src/nl/astraeus/jdbc/JdbcLogger.java
+++ b/src/nl/astraeus/jdbc/JdbcLogger.java
@@ -112,7 +112,7 @@
         }
 
         public String getSql() {
-            if (Settings.get().isFormattedQueries()) {
+            if (JdbcLogger.get().isFormattedQueries()) {
                 return SqlFormatter.getHTMLFormattedSQL(sql);
             } else {
                 return sql;
@@ -153,6 +153,9 @@
     private final List<LogEntry> queries;
     private long startTime;
     private boolean recording = false;
+    
+    private int numberOfQueries = 2500;
+    private boolean formattedQueries = true;
 
     public JdbcLogger() {
         queries = new LinkedList<LogEntry>();
@@ -187,7 +190,7 @@
         synchronized (queries) {
             queries.add(entry);
 
-            while (queries.size() > Settings.get().getNumberOfQueries()) {
+            while (queries.size() > getNumberOfQueries()) {
                 entry = queries.remove(0);
                 startTime = entry.getMilli();
             }
@@ -204,4 +207,19 @@
         }
     }
 
+    public int getNumberOfQueries() {
+        return numberOfQueries;
+    }
+
+    public void setNumberOfQueries(int numberOfQueries) {
+        this.numberOfQueries = numberOfQueries;
+    }
+
+    public boolean isFormattedQueries() {
+        return formattedQueries;
+    }
+
+    public void setFormattedQueries(boolean formattedQueries) {
+        this.formattedQueries = formattedQueries;
+    }
 }
diff --git a/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java b/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
index 08eb817..96690ba 100644
--- a/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
+++ b/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
@@ -79,6 +79,7 @@
         boolean ajax = "true".equals(req.getParameter("ajax"));
 
         resp.setContentType("text/html");
+
         Settings.get().readSettings(req);
 
         Page page = (Page)session.getAttribute("page");
@@ -120,7 +121,9 @@
         resp.getWriter().print(Warnings.get(req).render(req));
 
         long time = System.nanoTime();
+        resp.getWriter().println("<div class=\"container-fluid\">");
         resp.getWriter().print(page.render(req));
+        resp.getWriter().println("</div>");
 
         Settings.get().saveSettings(resp);
 
diff --git a/src/nl/astraeus/jdbc/web/bottom.html b/src/nl/astraeus/jdbc/web/bottom.html
index 1288de4..955c589 100644
--- a/src/nl/astraeus/jdbc/web/bottom.html
+++ b/src/nl/astraeus/jdbc/web/bottom.html
@@ -1,8 +1,18 @@
-</form>
+    </div>
+  </form>
 
-</div>
 
+<div id="loading"></div>
+
+<script type="text/javascript" src="resources/js/bootstrap-transition.js"></script>
 <script type="text/javascript" src="resources/js/bootstrap-dropdown.js"></script>
+<script type="text/javascript" src="resources/js/bootstrap-collapse.js"></script>
+
+    <script type="text/javascript" src="https://www.google.com/jsapi"></script>
+
+    <script type="text/javascript">
+        google.load('visualization', '1', {'packages':['corechart']});
+    </script>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/src/nl/astraeus/jdbc/web/head.html b/src/nl/astraeus/jdbc/web/head.html
index 54d9cb8..c99b11e 100644
--- a/src/nl/astraeus/jdbc/web/head.html
+++ b/src/nl/astraeus/jdbc/web/head.html
@@ -11,66 +11,16 @@
     <meta name="author" content="">
 
     <link href="resources/css/bootstrap.css" rel="stylesheet">
+    <link href="resources/css/jdbc-stats.css" rel="stylesheet">
     <link href="resources/css/bootstrap-responsive.css" rel="stylesheet">
 
-    <style type="text/css">
-        html, body {
-            padding: 0;
-            margin: 0;
-            width: 100%;
-            height: 95%;
-        }
-
-        body {
-            padding-top: 50px;
-        }
-
-        div#loading {
-            /*make invisible*/
-            display:none;
-            z-index:9999;
-
-            position:absolute;
-            top:0;
-            left:0;
-            width:100%;
-            height: 90%;
-            text-align:center;
-
-            /*in supporting browsers, make it
-          a little transparent*/
-            background: #fff url('/resources/images/loading.gif');
-            background-repeat:no-repeat;
-            background-attachment:fixed;
-            background-position:center;
-
-            _background: none; /*this line removes the background in IE*/
-            opacity:.5;
-            border-top: 0 solid #ddd;
-            border-bottom: 0 solid #ddd;
-
-            /*set the padding, so that the content
-       of the div is centered vertically*/
-            padding-top:0%;
-        }
-
-        code.sql {
-            color: black;
-            font-weight: bold
-        }
-        code.sql b {
-            color: blue;
-            /*font-weight: normal;*/
-        }
-    </style>
-
-    <script type="text/javascript" src="resources/js/jquery.js"></script>
-
     <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>
     <script type="text/javascript" src="resources/js/html5.js"></script>
     <![endif]-->
 
+    <script type="text/javascript" src="resources/js/jquery.js"></script>
+
     <script type="text/javascript">
         function submit(action, actionValue) {
             var params = 'ajax=true&action=' + action + '&actionValue=' + actionValue + '&' + $("#form").serialize();
@@ -98,8 +48,5 @@
 
 </head>
 <body>
-<div id="loading"></div>
-<form name="form" id="form" action="/" method="post" class="form-horizontal">
-
-    <div class="container" id="content">
-
+  <form name="form" id="form" action="/" method="post" class="form-horizontal">
+    <div id="content">
diff --git a/src/nl/astraeus/jdbc/web/page/Menu.html b/src/nl/astraeus/jdbc/web/page/Menu.html
index 8c3ea7c..3e8d139 100644
--- a/src/nl/astraeus/jdbc/web/page/Menu.html
+++ b/src/nl/astraeus/jdbc/web/page/Menu.html
@@ -1,6 +1,6 @@
 <div id="topmenu" class="navbar navbar-fixed-top" >
     <div class="navbar-inner">
-        <div class="container">
+        <div class="container-fluid">
             <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
diff --git a/src/nl/astraeus/jdbc/web/page/SettingsOverview.java b/src/nl/astraeus/jdbc/web/page/SettingsOverview.java
index 23a8ddd..6d85122 100644
--- a/src/nl/astraeus/jdbc/web/page/SettingsOverview.java
+++ b/src/nl/astraeus/jdbc/web/page/SettingsOverview.java
@@ -1,5 +1,6 @@
 package nl.astraeus.jdbc.web.page;
 
+import nl.astraeus.jdbc.JdbcLogger;
 import nl.astraeus.jdbc.web.model.Settings;
 
 import javax.servlet.http.HttpServletRequest;
@@ -17,19 +18,24 @@
     public Page processRequest(HttpServletRequest request) {
         Page result = this;
 
+        Settings settings = Settings.get();
+
         if ("save".equals(request.getParameter("action"))) {
             String nrq = request.getParameter("queries");
             String pq = request.getParameter("formattedQueries");
 
             if (nrq != null) {
-                Settings.get().setNumberOfQueries(Integer.parseInt(nrq));
+                settings.setNumberOfQueries(Integer.parseInt(nrq));
             }
 
             if (pq != null) {
-                Settings.get().setFormattedQueries(true);
+                settings.setFormattedQueries(true);
             } else {
-                Settings.get().setFormattedQueries(false);
+                settings.setFormattedQueries(false);
             }
+
+            JdbcLogger.get().setNumberOfQueries(settings.getNumberOfQueries());
+            JdbcLogger.get().setFormattedQueries(settings.isFormattedQueries());
             
             Warnings.get(request).addMessage(Warnings.Message.Type.SUCCESS, "Success!", "Settings are successfully saved.");
         }
@@ -40,8 +46,9 @@
     @Override
     public Map<String, Object> defineModel(HttpServletRequest request) {
         Map<String, Object> result = new HashMap<String, Object>();
+        Settings settings = Settings.get();
 
-        int nrq = Settings.get().getNumberOfQueries();
+        int nrq = settings.getNumberOfQueries();
         result.put("q1000", nrq == 1000);
         result.put("q2500", nrq == 2500);
         result.put("q5000", nrq == 5000);
@@ -49,7 +56,7 @@
         result.put("q15000", nrq == 15000);
         result.put("q25000", nrq == 25000);
 
-        result.put("formattedQueries", Settings.get().isFormattedQueries());
+        result.put("formattedQueries", settings.isFormattedQueries());
 
         return result;
     }
diff --git a/src/nl/astraeus/jdbc/web/resources/css/jdbc-stats.css b/src/nl/astraeus/jdbc/web/resources/css/jdbc-stats.css
new file mode 100644
index 0000000..1cd237b
--- /dev/null
+++ b/src/nl/astraeus/jdbc/web/resources/css/jdbc-stats.css
@@ -0,0 +1,49 @@
+
+html, body {
+    padding: 0;
+    margin: 0;
+    width: 100%;
+    height: 95%;
+}
+
+body {
+    padding-top: 50px;
+}
+
+div#loading {
+    /*make invisible*/
+    display:none;
+    z-index:9999;
+
+    position:absolute;
+    top:0;
+    left:0;
+    width:100%;
+    height: 90%;
+    text-align:center;
+
+    /*in supporting browsers, make it
+  a little transparent*/
+    background: #fff url('/resources/images/loading.gif');
+    background-repeat:no-repeat;
+    background-attachment:fixed;
+    background-position:center;
+
+    _background: none; /*this line removes the background in IE*/
+    opacity:.5;
+    border-top: 0 solid #ddd;
+    border-bottom: 0 solid #ddd;
+
+    /*set the padding, so that the content
+of the div is centered vertically*/
+    padding-top:0%;
+}
+
+code.sql {
+    color: black;
+    font-weight: bold
+}
+code.sql b {
+    color: blue;
+    /*font-weight: normal;*/
+}
\ No newline at end of file

diff --git a/LICENCE.txt b/LICENCE.txt
new file mode 100644
index 0000000..edbd3f4
--- /dev/null
+++ b/LICENCE.txt
@@ -0,0 +1,19 @@
+Copyright (c) 2012, Rien Nentjes
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file
diff --git a/src/nl/astraeus/jdbc/JdbcLogger.java b/src/nl/astraeus/jdbc/JdbcLogger.java
index 08e525d..e9cc338 100644
--- a/src/nl/astraeus/jdbc/JdbcLogger.java
+++ b/src/nl/astraeus/jdbc/JdbcLogger.java
@@ -112,7 +112,7 @@
         }
 
         public String getSql() {
-            if (Settings.get().isFormattedQueries()) {
+            if (JdbcLogger.get().isFormattedQueries()) {
                 return SqlFormatter.getHTMLFormattedSQL(sql);
             } else {
                 return sql;
@@ -153,6 +153,9 @@
     private final List<LogEntry> queries;
     private long startTime;
     private boolean recording = false;
+    
+    private int numberOfQueries = 2500;
+    private boolean formattedQueries = true;
 
     public JdbcLogger() {
         queries = new LinkedList<LogEntry>();
@@ -187,7 +190,7 @@
         synchronized (queries) {
             queries.add(entry);
 
-            while (queries.size() > Settings.get().getNumberOfQueries()) {
+            while (queries.size() > getNumberOfQueries()) {
                 entry = queries.remove(0);
                 startTime = entry.getMilli();
             }
@@ -204,4 +207,19 @@
         }
     }
 
+    public int getNumberOfQueries() {
+        return numberOfQueries;
+    }
+
+    public void setNumberOfQueries(int numberOfQueries) {
+        this.numberOfQueries = numberOfQueries;
+    }
+
+    public boolean isFormattedQueries() {
+        return formattedQueries;
+    }
+
+    public void setFormattedQueries(boolean formattedQueries) {
+        this.formattedQueries = formattedQueries;
+    }
 }
diff --git a/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java b/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
index 08eb817..96690ba 100644
--- a/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
+++ b/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
@@ -79,6 +79,7 @@
         boolean ajax = "true".equals(req.getParameter("ajax"));
 
         resp.setContentType("text/html");
+
         Settings.get().readSettings(req);
 
         Page page = (Page)session.getAttribute("page");
@@ -120,7 +121,9 @@
         resp.getWriter().print(Warnings.get(req).render(req));
 
         long time = System.nanoTime();
+        resp.getWriter().println("<div class=\"container-fluid\">");
         resp.getWriter().print(page.render(req));
+        resp.getWriter().println("</div>");
 
         Settings.get().saveSettings(resp);
 
diff --git a/src/nl/astraeus/jdbc/web/bottom.html b/src/nl/astraeus/jdbc/web/bottom.html
index 1288de4..955c589 100644
--- a/src/nl/astraeus/jdbc/web/bottom.html
+++ b/src/nl/astraeus/jdbc/web/bottom.html
@@ -1,8 +1,18 @@
-</form>
+    </div>
+  </form>
 
-</div>
 
+<div id="loading"></div>
+
+<script type="text/javascript" src="resources/js/bootstrap-transition.js"></script>
 <script type="text/javascript" src="resources/js/bootstrap-dropdown.js"></script>
+<script type="text/javascript" src="resources/js/bootstrap-collapse.js"></script>
+
+    <script type="text/javascript" src="https://www.google.com/jsapi"></script>
+
+    <script type="text/javascript">
+        google.load('visualization', '1', {'packages':['corechart']});
+    </script>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/src/nl/astraeus/jdbc/web/head.html b/src/nl/astraeus/jdbc/web/head.html
index 54d9cb8..c99b11e 100644
--- a/src/nl/astraeus/jdbc/web/head.html
+++ b/src/nl/astraeus/jdbc/web/head.html
@@ -11,66 +11,16 @@
     <meta name="author" content="">
 
     <link href="resources/css/bootstrap.css" rel="stylesheet">
+    <link href="resources/css/jdbc-stats.css" rel="stylesheet">
     <link href="resources/css/bootstrap-responsive.css" rel="stylesheet">
 
-    <style type="text/css">
-        html, body {
-            padding: 0;
-            margin: 0;
-            width: 100%;
-            height: 95%;
-        }
-
-        body {
-            padding-top: 50px;
-        }
-
-        div#loading {
-            /*make invisible*/
-            display:none;
-            z-index:9999;
-
-            position:absolute;
-            top:0;
-            left:0;
-            width:100%;
-            height: 90%;
-            text-align:center;
-
-            /*in supporting browsers, make it
-          a little transparent*/
-            background: #fff url('/resources/images/loading.gif');
-            background-repeat:no-repeat;
-            background-attachment:fixed;
-            background-position:center;
-
-            _background: none; /*this line removes the background in IE*/
-            opacity:.5;
-            border-top: 0 solid #ddd;
-            border-bottom: 0 solid #ddd;
-
-            /*set the padding, so that the content
-       of the div is centered vertically*/
-            padding-top:0%;
-        }
-
-        code.sql {
-            color: black;
-            font-weight: bold
-        }
-        code.sql b {
-            color: blue;
-            /*font-weight: normal;*/
-        }
-    </style>
-
-    <script type="text/javascript" src="resources/js/jquery.js"></script>
-
     <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>
     <script type="text/javascript" src="resources/js/html5.js"></script>
     <![endif]-->
 
+    <script type="text/javascript" src="resources/js/jquery.js"></script>
+
     <script type="text/javascript">
         function submit(action, actionValue) {
             var params = 'ajax=true&action=' + action + '&actionValue=' + actionValue + '&' + $("#form").serialize();
@@ -98,8 +48,5 @@
 
 </head>
 <body>
-<div id="loading"></div>
-<form name="form" id="form" action="/" method="post" class="form-horizontal">
-
-    <div class="container" id="content">
-
+  <form name="form" id="form" action="/" method="post" class="form-horizontal">
+    <div id="content">
diff --git a/src/nl/astraeus/jdbc/web/page/Menu.html b/src/nl/astraeus/jdbc/web/page/Menu.html
index 8c3ea7c..3e8d139 100644
--- a/src/nl/astraeus/jdbc/web/page/Menu.html
+++ b/src/nl/astraeus/jdbc/web/page/Menu.html
@@ -1,6 +1,6 @@
 <div id="topmenu" class="navbar navbar-fixed-top" >
     <div class="navbar-inner">
-        <div class="container">
+        <div class="container-fluid">
             <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
diff --git a/src/nl/astraeus/jdbc/web/page/SettingsOverview.java b/src/nl/astraeus/jdbc/web/page/SettingsOverview.java
index 23a8ddd..6d85122 100644
--- a/src/nl/astraeus/jdbc/web/page/SettingsOverview.java
+++ b/src/nl/astraeus/jdbc/web/page/SettingsOverview.java
@@ -1,5 +1,6 @@
 package nl.astraeus.jdbc.web.page;
 
+import nl.astraeus.jdbc.JdbcLogger;
 import nl.astraeus.jdbc.web.model.Settings;
 
 import javax.servlet.http.HttpServletRequest;
@@ -17,19 +18,24 @@
     public Page processRequest(HttpServletRequest request) {
         Page result = this;
 
+        Settings settings = Settings.get();
+
         if ("save".equals(request.getParameter("action"))) {
             String nrq = request.getParameter("queries");
             String pq = request.getParameter("formattedQueries");
 
             if (nrq != null) {
-                Settings.get().setNumberOfQueries(Integer.parseInt(nrq));
+                settings.setNumberOfQueries(Integer.parseInt(nrq));
             }
 
             if (pq != null) {
-                Settings.get().setFormattedQueries(true);
+                settings.setFormattedQueries(true);
             } else {
-                Settings.get().setFormattedQueries(false);
+                settings.setFormattedQueries(false);
             }
+
+            JdbcLogger.get().setNumberOfQueries(settings.getNumberOfQueries());
+            JdbcLogger.get().setFormattedQueries(settings.isFormattedQueries());
             
             Warnings.get(request).addMessage(Warnings.Message.Type.SUCCESS, "Success!", "Settings are successfully saved.");
         }
@@ -40,8 +46,9 @@
     @Override
     public Map<String, Object> defineModel(HttpServletRequest request) {
         Map<String, Object> result = new HashMap<String, Object>();
+        Settings settings = Settings.get();
 
-        int nrq = Settings.get().getNumberOfQueries();
+        int nrq = settings.getNumberOfQueries();
         result.put("q1000", nrq == 1000);
         result.put("q2500", nrq == 2500);
         result.put("q5000", nrq == 5000);
@@ -49,7 +56,7 @@
         result.put("q15000", nrq == 15000);
         result.put("q25000", nrq == 25000);
 
-        result.put("formattedQueries", Settings.get().isFormattedQueries());
+        result.put("formattedQueries", settings.isFormattedQueries());
 
         return result;
     }
diff --git a/src/nl/astraeus/jdbc/web/resources/css/jdbc-stats.css b/src/nl/astraeus/jdbc/web/resources/css/jdbc-stats.css
new file mode 100644
index 0000000..1cd237b
--- /dev/null
+++ b/src/nl/astraeus/jdbc/web/resources/css/jdbc-stats.css
@@ -0,0 +1,49 @@
+
+html, body {
+    padding: 0;
+    margin: 0;
+    width: 100%;
+    height: 95%;
+}
+
+body {
+    padding-top: 50px;
+}
+
+div#loading {
+    /*make invisible*/
+    display:none;
+    z-index:9999;
+
+    position:absolute;
+    top:0;
+    left:0;
+    width:100%;
+    height: 90%;
+    text-align:center;
+
+    /*in supporting browsers, make it
+  a little transparent*/
+    background: #fff url('/resources/images/loading.gif');
+    background-repeat:no-repeat;
+    background-attachment:fixed;
+    background-position:center;
+
+    _background: none; /*this line removes the background in IE*/
+    opacity:.5;
+    border-top: 0 solid #ddd;
+    border-bottom: 0 solid #ddd;
+
+    /*set the padding, so that the content
+of the div is centered vertically*/
+    padding-top:0%;
+}
+
+code.sql {
+    color: black;
+    font-weight: bold
+}
+code.sql b {
+    color: blue;
+    /*font-weight: normal;*/
+}
\ No newline at end of file
diff --git a/src/nl/astraeus/jdbc/web/resources/js/chart.js b/src/nl/astraeus/jdbc/web/resources/js/chart.js
new file mode 100644
index 0000000..23c2c8b
--- /dev/null
+++ b/src/nl/astraeus/jdbc/web/resources/js/chart.js
@@ -0,0 +1,56 @@
+/**
+ *
+ * User: rnentjes
+ * Date: 4/2/11
+ * Time: 4:49 PM
+ *
+ *  Requires jquery 1.5+
+ */
+
+Chart = function() {
+
+    var options;
+    var canvas;
+
+    function executeDraw(data) {
+        var canvasContext = canvas.getContext("2d");
+
+
+    }
+
+    function executeInit(c) {
+        canvas = c;
+
+        options = {};
+
+        options.fillStyle = '#000000';
+        options.strokeStyle = '#777777';
+        options.lineWidth = 1;
+    }
+
+    /*
+    data = { start: '', end: '', queries: [
+     {
+       query: #hash,
+       thread: 1,
+       start: '',
+       duration: ''
+      },
+     {
+     }
+    ]
+    */
+
+    return {
+        init: function(canvas) {
+            executeInit(canvas);
+        },
+
+        draw: function(data) {
+            executeDraw(data);
+        }
+
+
+    };
+
+}();