diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html
index efaa6428d..e5b5ad329 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html
@@ -5,6 +5,8 @@
     <title>Gemp-LotR</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta http-equiv="pragma" content="no-cache"/>
+    <meta http-equiv="Cache-Control" content="no-cache"/>
+    <meta http-equiv="Expires" content="-1">
 
     <style type="text/css">
         body {
@@ -93,16 +95,16 @@
     <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
     <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
 
-    <script type="text/javascript" src="js/gemp-001/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-001/common.js"></script>
-    <script type="text/javascript" src="js/gemp-001/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-001/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-001/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-001/jCards.js"></script>
-    <script type="text/javascript" src="js/gemp-001/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-001/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-001/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-001/cardFilter.js"></script>
+    <script type="text/javascript" src="js/gemp-002/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-002/common.js"></script>
+    <script type="text/javascript" src="js/gemp-002/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-002/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-002/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-002/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-002/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-002/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-002/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-002/cardFilter.js"></script>
 
     <script type="text/javascript">
 
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html
index e70386911..c7f68a88e 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html
@@ -5,6 +5,8 @@
 <title>Game of Gemp-LotR</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <meta http-equiv="pragma" content="no-cache"/>
+<meta http-equiv="Cache-Control" content="no-cache"/>
+<meta http-equiv="Expires" content="-1">
 
 <style type="text/css">
 body {
@@ -318,16 +320,16 @@ body {
 <script type="text/javascript" src="js/jquery/jquery.spinnercontrol.js"></script>
 <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
 
-<script type="text/javascript" src="js/gemp-001/inheritance.js"></script>
-<script type="text/javascript" src="js/gemp-001/communication.js"></script>
-<script type="text/javascript" src="js/gemp-001/common.js"></script>
-<script type="text/javascript" src="js/gemp-001/chat.js"></script>
-<script type="text/javascript" src="js/gemp-001/commonUi.js"></script>
-<script type="text/javascript" src="js/gemp-001/gameUi.js"></script>
-<script type="text/javascript" src="js/gemp-001/gameAnimations.js"></script>
-<script type="text/javascript" src="js/gemp-001/jCardGroup.js"></script>
-<script type="text/javascript" src="js/gemp-001/jCards.js"></script>
-<script type="text/javascript" src="js/gemp-001/logging.js"></script>
+<script type="text/javascript" src="js/gemp-002/inheritance.js"></script>
+<script type="text/javascript" src="js/gemp-002/communication.js"></script>
+<script type="text/javascript" src="js/gemp-002/common.js"></script>
+<script type="text/javascript" src="js/gemp-002/chat.js"></script>
+<script type="text/javascript" src="js/gemp-002/commonUi.js"></script>
+<script type="text/javascript" src="js/gemp-002/gameUi.js"></script>
+<script type="text/javascript" src="js/gemp-002/gameAnimations.js"></script>
+<script type="text/javascript" src="js/gemp-002/jCardGroup.js"></script>
+<script type="text/javascript" src="js/gemp-002/jCards.js"></script>
+<script type="text/javascript" src="js/gemp-002/logging.js"></script>
 
 <script type="text/javascript">
     var ui;
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html
index bb4cc5c5c..2f7b2c852 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html
@@ -5,6 +5,8 @@
 <title>Gemp-LotR</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <meta http-equiv="pragma" content="no-cache"/>
+<meta http-equiv="Cache-Control" content="no-cache"/>
+<meta http-equiv="Expires" content="-1">
 
 <style type="text/css">
     body {
@@ -150,19 +152,19 @@
 <script type="text/javascript" src="js/jquery/jquery-1.6.2.js"></script>
 <script type="text/javascript" src="js/jquery/jquery-ui-1.8.16.custom.min.js"></script>
 
-<script type="text/javascript" src="js/gemp-001/inheritance.js"></script>
-<script type="text/javascript" src="js/gemp-001/common.js"></script>
-<script type="text/javascript" src="js/gemp-001/logging.js"></script>
-<script type="text/javascript" src="js/gemp-001/chat.js"></script>
-<script type="text/javascript" src="js/gemp-001/commonUi.js"></script>
-<script type="text/javascript" src="js/gemp-001/hallUi.js"></script>
-<script type="text/javascript" src="js/gemp-001/leagueResultsUi.js"></script>
-<script type="text/javascript" src="js/gemp-001/gameHistoryUi.js"></script>
-<script type="text/javascript" src="js/gemp-001/communication.js"></script>
+<script type="text/javascript" src="js/gemp-002/inheritance.js"></script>
+<script type="text/javascript" src="js/gemp-002/common.js"></script>
+<script type="text/javascript" src="js/gemp-002/logging.js"></script>
+<script type="text/javascript" src="js/gemp-002/chat.js"></script>
+<script type="text/javascript" src="js/gemp-002/commonUi.js"></script>
+<script type="text/javascript" src="js/gemp-002/hallUi.js"></script>
+<script type="text/javascript" src="js/gemp-002/leagueResultsUi.js"></script>
+<script type="text/javascript" src="js/gemp-002/gameHistoryUi.js"></script>
+<script type="text/javascript" src="js/gemp-002/communication.js"></script>
 <!-- This is needed for delivery -->
-<script type="text/javascript" src="js/gemp-001/deliveryService.js"></script>
-<script type="text/javascript" src="js/gemp-001/jCardGroup.js"></script>
-<script type="text/javascript" src="js/gemp-001/jCards.js"></script>
+<script type="text/javascript" src="js/gemp-002/deliveryService.js"></script>
+<script type="text/javascript" src="js/gemp-002/jCardGroup.js"></script>
+<script type="text/javascript" src="js/gemp-002/jCards.js"></script>
 
 <script type="text/javascript">
     var chat;
@@ -204,11 +206,11 @@
 
                 var infoDialog = $("<div></div>")
                         .dialog({
-                            autoOpen: false,
-                            closeOnEscape: true,
-                            resizable: false,
-                            title: "Card information"
-                        });
+                    autoOpen: false,
+                    closeOnEscape: true,
+                    resizable: false,
+                    title: "Card information"
+                });
 
                 $("body").click(
                         function (event) {
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/index.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/index.html
index 6fb4225e7..a7f281f9f 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/index.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/index.html
@@ -5,6 +5,8 @@
     <title>Gemp-LotR</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta http-equiv="pragma" content="no-cache"/>
+    <meta http-equiv="Cache-Control" content="no-cache"/>
+    <meta http-equiv="Expires" content="-1">
 
     <style type="text/css">
         body {
@@ -21,9 +23,9 @@
     <script type="text/javascript" src="js/jquery/jquery-1.6.2.js"></script>
     <script type="text/javascript" src="js/jquery/jquery-ui-1.8.16.custom.min.js"></script>
 
-    <script type="text/javascript" src="js/gemp-001/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-001/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-001/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-002/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-002/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-002/communication.js"></script>
 
     <script type="text/javascript">
         function getUrlParam(param) {
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/chat.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/chat.js
index 50a2a0d59..8e653d872 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/chat.js
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/chat.js
@@ -54,16 +54,22 @@ var ChatBoxUI = Class.extend({
         this.div.append(this.chatMessagesDiv);
 
         if (this.name != null) {
-            this.chatTalkDiv = $("<input class='chatTalk'>");
+            this.chatTalkDiv = $("<input type='text' class='chatTalk'>");
 
             if (showHideSystemButton) {
-                this.hideSystemButton = $("<input type='checkbox' id='showSystemMessages' /><label for='showSystemMessages'><span class='ui-icon ui-icon-info'></span></label>").button();
+                this.hideSystemButton = $("<button id='showSystemMessages'>Toggle system messages</button>").button(
+                {icons: {
+                    primary: "ui-icon-zoomin"
+                }, text: false});
                 this.hideSystemButton.click(
                         function() {
-                            if (that.hideSystemButton.checked)
-                                that.showMessageClass("systemMessage");
-                            else
+                            if (that.isShowingMessageClass("systemMessage")) {
+                                $('#showSystemMessages').button("option", "icons", {primary:'ui-icon-zoomin'})
                                 that.hideMessageClass("systemMessage");
+                            } else {
+                                $('#showSystemMessages').button("option", "icons", {primary:'ui-icon-zoomout'})
+                                that.showMessageClass("systemMessage");
+                            }
                         });
                 this.hideMessageClass("systemMessage");
             }
@@ -79,16 +85,16 @@ var ChatBoxUI = Class.extend({
                     function(xml) {
                         that.processMessages(xml, true);
                     }, {
-                        "401": function() {
-                            that.appendMessage("You are not logged in, go to the main page to log in.", "warningMessage");
-                        },
-                        "403": function() {
-                            that.appendMessage("You have no permission to join this chat.", "warningMessage");
-                        },
-                        "404": function() {
-                            that.appendMessage("Chat room was closed, please go to the Game Hall.", "warningMessage");
-                        }
-                    });
+                "401": function() {
+                    that.appendMessage("You are not logged in, go to the main page to log in.", "warningMessage");
+                },
+                "403": function() {
+                    that.appendMessage("You have no permission to join this chat.", "warningMessage");
+                },
+                "404": function() {
+                    that.appendMessage("Chat room was closed, please go to the Game Hall.", "warningMessage");
+                }
+            });
 
             this.chatTalkDiv.bind("keypress", function(e) {
                 var code = (e.keyCode ? e.keyCode : e.which);
@@ -111,6 +117,11 @@ var ChatBoxUI = Class.extend({
         $("div.message." + msgClass, this.chatMessagesDiv).hide();
     },
 
+    isShowingMessageClass: function(msgClass) {
+        var index = $.inArray(msgClass, this.hiddenClasses);
+        return index == -1;
+    },
+
     showMessageClass: function(msgClass) {
         var index = $.inArray(msgClass, this.hiddenClasses);
         if (index > -1) {
@@ -135,8 +146,8 @@ var ChatBoxUI = Class.extend({
         this.chatMessagesDiv.css({ position: "absolute", left: x + "px", top: y + "px", width: width - userListWidth, height: height - this.talkBoxHeight - 3 * talkBoxPadding, overflow: "auto" });
         if (this.chatTalkDiv != null) {
             if (this.hideSystemButton != null) {
-                this.hideSystemButton.css({position: "absolute", left: x + width - 2 * talkBoxPadding - this.talkBoxHeight + "px", top: y - 2 * talkBoxPadding + (height - this.talkBoxHeight) + "px", width: this.talkBoxHeight, height: this.talkBoxHeight});
-                this.chatTalkDiv.css({ position: "absolute", left: x + talkBoxPadding + "px", top: y - 2 * talkBoxPadding + (height - this.talkBoxHeight) + "px", width: width - 3 * talkBoxPadding , height: this.talkBoxHeight });
+                this.hideSystemButton.css({position: "absolute", left: x + width - talkBoxPadding - this.talkBoxHeight + "px", top: y - 2 * talkBoxPadding + (height - this.talkBoxHeight) + "px", width: this.talkBoxHeight, height: this.talkBoxHeight});
+                this.chatTalkDiv.css({ position: "absolute", left: x + talkBoxPadding + "px", top: y - 2 * talkBoxPadding + (height - this.talkBoxHeight) + "px", width: width - 4 * talkBoxPadding - this.talkBoxHeight, height: this.talkBoxHeight });
             } else {
                 this.chatTalkDiv.css({ position: "absolute", left: x + talkBoxPadding + "px", top: y - 2 * talkBoxPadding + (height - this.talkBoxHeight) + "px", width: width - 3 * talkBoxPadding , height: this.talkBoxHeight });
             }
@@ -150,7 +161,7 @@ var ChatBoxUI = Class.extend({
 
         this.chatMessagesDiv.append(messageDiv);
         var index = $.inArray(msgClass, this.hiddenClasses);
-        if (index > -1) {
+        if (!this.isShowingMessageClass(msgClass)) {
             messageDiv.hide();
         }
 
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/merchant.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/merchant.html
index 1f71ae055..fcd3503bf 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/merchant.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/merchant.html
@@ -5,6 +5,8 @@
     <title>Gemp-LotR</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta http-equiv="pragma" content="no-cache"/>
+    <meta http-equiv="Cache-Control" content="no-cache"/>
+    <meta http-equiv="Expires" content="-1">
 
     <style type="text/css">
         body {
@@ -93,16 +95,16 @@
     <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
     <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
 
-    <script type="text/javascript" src="js/gemp-001/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-001/common.js"></script>
-    <script type="text/javascript" src="js/gemp-001/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-001/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-001/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-001/jCards.js"></script>
-    <script type="text/javascript" src="js/gemp-001/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-001/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-001/merchantUi.js"></script>
-    <script type="text/javascript" src="js/gemp-001/cardFilter.js"></script>
+    <script type="text/javascript" src="js/gemp-002/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-002/common.js"></script>
+    <script type="text/javascript" src="js/gemp-002/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-002/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-002/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-002/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-002/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-002/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-002/merchantUi.js"></script>
+    <script type="text/javascript" src="js/gemp-002/cardFilter.js"></script>
 
     <script type="text/javascript">