diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/includes/help.html b/gemp-lotr/gemp-lotr-async/src/main/web/includes/help.html
index 3ce06e0c8..618c9c83e 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/includes/help.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/includes/help.html
@@ -26,6 +26,7 @@
 				This video is the best way to learn the basics of the LOTR-TCG:
 				<iframe width="420" height="315"
 						src="https://www.youtube.com/embed/sBUS8yt4G_8">
+				</iframe>
 			</p>
 			<p>
 				Once you understand the basics, you can learn about how to play on GEMP using the below videos.  The manual is also below on this page.
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/leagueResultsUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/leagueResultsUi.js
index 4e2415b0f..0fa0b5cd5 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/leagueResultsUi.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/leagueResultsUi.js
@@ -85,7 +85,11 @@ var LeagueResultsUI = Class.extend({
                     var draftBut = $("<button>Go to draft</button>").button();
                     var draftFunc = (function (leagueCode) {
                         return function() {
-                            location.href = "/gemp-lotr/soloDraft.html?leagueType="+leagueCode;
+                            var win = window.open("/gemp-lotr/soloDraft.html?leagueType=" + leagueCode, '_blank');
+                            if (win) {
+                                //Browser has allowed it to be opened
+                                win.focus();
+                            }
                         };
                     })(leagueType);
                     draftBut.click(draftFunc);
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/soloDraftUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/soloDraftUi.js
index 5eb10646c..2e2a2b3f0 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/soloDraftUi.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/soloDraftUi.js
@@ -51,6 +51,15 @@ var GempLotrSoloDraftUI = Class.extend({
                 function (event) {
                     return that.dragStopCardFunction(event);
                 });
+        $("body")[0].addEventListener("contextmenu",
+            function (event) {
+                if(!that.clickCardFunction(event))
+                {
+                    event.preventDefault();
+                    return false;
+                }
+                return true;
+            });
 
         var width = $(window).width();
         var height = $(window).height();
@@ -93,14 +102,14 @@ var GempLotrSoloDraftUI = Class.extend({
                         var blueprintId = availablePick.getAttribute("blueprintId");
 
                         if (blueprintId != null) {
-                            var card = new Card(blueprintId, "picks", "deck", "player");
-                            var cardDiv = createCardDiv(card.imageUrl, null, card.isFoil(), false, false, card.hasErrata());
+                            var card = new Card(blueprintId, null, null, "picks", "deck", "player");
+                            var cardDiv = Card.CreateCardDiv(card.imageUrl, null, null, card.isFoil(), false, false, card.hasErrata(), false);
                             cardDiv.data("card", card);
                             cardDiv.data("choiceId", id);
                             that.picksDiv.append(cardDiv);
                         } else {
-                            var card = new Card("rules", "picks", "deck", "player");
-                            var cardDiv = createCardDiv(url, null, false, false, true, false);
+                            var card = new Card("rules", null, null, "picks", "deck", "player");
+                            var cardDiv = Card.CreateCardDiv(url, null, null, false, false, true, false, false);
                             cardDiv.data("card", card);
                             cardDiv.data("choiceId", id);
                             that.picksDiv.append(cardDiv);
@@ -124,8 +133,8 @@ var GempLotrSoloDraftUI = Class.extend({
                         var count = card.getAttribute("count");
                         var blueprintId = card.getAttribute("blueprintId");
                         for (var no = 0; no < count; no++) {
-                            var card = new Card(blueprintId, "drafted", "deck", "player");
-                            var cardDiv = createCardDiv(card.imageUrl, null, card.isFoil(), false, false, card.hasErrata());
+                            var card = new Card(blueprintId, null, null, "drafted", "deck", "player");
+                            var cardDiv = Card.CreateCardDiv(card.imageUrl, null, null, card.isFoil(), false, false, card.hasErrata(), false);
                             cardDiv.data("card", card);
                             that.draftedDiv.append(cardDiv);
                         }
@@ -150,10 +159,13 @@ var GempLotrSoloDraftUI = Class.extend({
 
         if (tar.hasClass("actionArea")) {
             var selectedCardElem = tar.closest(".card");
+            var card = selectedCardElem.data("card");
+            debugger;
             if (event.which >= 1) {
                 if (!this.successfulDrag) {
                     if (event.shiftKey || event.which > 1) {
                         this.displayCardInfo(selectedCardElem.data("card"));
+                        return false;
                     } else {
                         if (selectedCardElem.data("card").zone == "picks") {
                             var choiceId = selectedCardElem.data("choiceId");
@@ -166,8 +178,8 @@ var GempLotrSoloDraftUI = Class.extend({
                                         var blueprintId = pickedCard.getAttribute("blueprintId");
                                         var count = pickedCard.getAttribute("count");
                                         for (var no = 0; no < count; no++) {
-                                            var card = new Card(blueprintId, "drafted", "deck", "player");
-                                            var cardDiv = createCardDiv(card.imageUrl, null, card.isFoil(), false, false, card.hasErrata());
+                                            var card = new Card(blueprintId, null, null, "drafted", "deck", "player");
+                                            var cardDiv = Card.CreateCardDiv(card.imageUrl, null, null, card.isFoil(), false, false, card.hasErrata(), false);
                                             cardDiv.data("card", card);
                                             that.draftedDiv.append(cardDiv);
                                         }
@@ -182,14 +194,14 @@ var GempLotrSoloDraftUI = Class.extend({
                                         var blueprintId = availablePick.getAttribute("blueprintId");
 
                                         if (blueprintId != null) {
-                                            var card = new Card(blueprintId, "picks", "deck", "player");
-                                            var cardDiv = createCardDiv(card.imageUrl, null, card.isFoil(), false, false, card.hasErrata());
+                                            var card = new Card(blueprintId, null, null, "picks", "deck", "player");
+                                            var cardDiv = Card.CreateCardDiv(card.imageUrl, null, null, card.isFoil(), false, false, card.hasErrata(), false);
                                             cardDiv.data("card", card);
                                             cardDiv.data("choiceId", id);
                                             that.picksDiv.append(cardDiv);
                                         } else {
-                                            var card = new Card("rules", "picks", "deck", "player");
-                                            var cardDiv = createCardDiv(url, null, false, false, true, false);
+                                            var card = new Card("rules", null, null, "picks", "deck", "player");
+                                            var cardDiv = Card.CreateCardDiv(url, null, null, false, false, true, false, false);
                                             cardDiv.data("card", card);
                                             cardDiv.data("choiceId", id);
                                             that.picksDiv.append(cardDiv);
@@ -251,7 +263,7 @@ var GempLotrSoloDraftUI = Class.extend({
     displayCardInfo:function (card) {
         this.infoDialog.html("");
         this.infoDialog.html("<div style='scroll: auto'></div>");
-        this.infoDialog.append(createFullCardDiv(card.imageUrl, card.foil, card.horizontal, card.isPack()));
+        this.infoDialog.append(Card.CreateFullCardDiv(card.imageUrl, null, card.foil, card.horizontal, card.isPack()));
         if (card.hasWikiInfo())
             this.infoDialog.append("<div><a href='" + card.getWikiLink() + "' target='_blank'>Wiki</a></div>");
         var windowWidth = $(window).width();
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html b/gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html
index e5fdb709b..e6d063241 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html
@@ -29,12 +29,20 @@
     <script type="text/javascript" src="js/gemp-022/chat.js"></script>
     <script type="text/javascript" src="js/gemp-022/communication.js"></script>
     <script type="text/javascript" src="js/gemp-022/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-022/cardFilter.js"></script>
+    
+    <script type="text/javascript" src="js/gemp-022/deckbuilderDeliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-022/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/cards/CardFilter.js"></script>
+
+    <script type="text/javascript" src="js/gemp-022/cards/CardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-022/cards/Card.js"></script>
+    <script type="text/javascript" src="js/gemp-022/cards/CardDisplay.js"></script>
+    <script type="text/javascript" src="js/gemp-022/cards/CardInfoDialog.js"></script>
+    <script type="text/javascript" src="js/gemp-022/cards/CardImages.js"></script>
+    <script type="text/javascript" src="js/gemp-022/cards/PackImages.js"></script>
 
-    <script type="text/javascript" src="js/gemp-022/jCardGroup.js"></script>
     <script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
     <script type="text/javascript" src="js/gemp-022/set40.js"></script>
-    <script type="text/javascript" src="js/gemp-022/jCards.js"></script>
     <script type="text/javascript" src="js/gemp-022/PC_Cards.js"></script>
 
     <script type="text/javascript" src="js/gemp-022/hallUi.js"></script>