diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/EoF - Faramir Starter.pack b/gemp-lotr/gemp-lotr-server/src/main/resources/EoF - Faramir Starter.pack
index e1a6b4aba..7235fce5c 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/EoF - Faramir Starter.pack	
+++ b/gemp-lotr/gemp-lotr-server/src/main/resources/EoF - Faramir Starter.pack	
@@ -42,7 +42,7 @@
 1x6_49
 1x6_38
 1x6_39
-2x5_121
+2x6_121
 1x6_52
 3x4_306
 1x6_54
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/packs.txt b/gemp-lotr/gemp-lotr-server/src/main/resources/packs.txt
index 4c263a0a2..1b3915d02 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/packs.txt
+++ b/gemp-lotr/gemp-lotr-server/src/main/resources/packs.txt
@@ -17,4 +17,5 @@ TTT - Theoden Starter
 BoHD - Eowyn Starter
 BoHD - Legolas Starter
 EoF - Faramir Starter
-EoF - Witch-king Starter
\ No newline at end of file
+EoF - Witch-king Starter
+(S)TTT - Starter
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/CollectionResource.java b/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/CollectionResource.java
index fa45e7976..36d0f5808 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/CollectionResource.java
+++ b/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/CollectionResource.java
@@ -22,6 +22,7 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import java.util.List;
+import java.util.Map;
 
 @Singleton
 @Path("/collection")
@@ -179,11 +180,11 @@ public class CollectionResource extends AbstractResource {
         Element collectionElem = doc.createElement("pack");
         doc.appendChild(collectionElem);
 
-        for (CardCollection.Item item : packContents.getItems(null, _library)) {
-            String blueprintId = item.getBlueprintId();
-            if (item.getType() == CardCollection.Item.Type.CARD) {
+        for (Map.Entry<String, Integer> itemCount : packContents.getAll().entrySet()) {
+            String blueprintId = itemCount.getKey();
+            if (blueprintId.contains("_")) {
                 Element card = doc.createElement("card");
-                card.setAttribute("count", String.valueOf(item.getCount()));
+                card.setAttribute("count", String.valueOf(itemCount.getValue()));
                 card.setAttribute("blueprintId", blueprintId);
                 Side side = _library.getLotroCardBlueprint(blueprintId).getSide();
                 if (side != null)
@@ -191,7 +192,7 @@ public class CollectionResource extends AbstractResource {
                 collectionElem.appendChild(card);
             } else {
                 Element pack = doc.createElement("pack");
-                pack.setAttribute("count", String.valueOf(item.getCount()));
+                pack.setAttribute("count", String.valueOf(itemCount.getValue()));
                 pack.setAttribute("blueprintId", blueprintId);
                 collectionElem.appendChild(pack);
             }
diff --git a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/DeliveryResource.java b/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/DeliveryResource.java
index d63b5c039..10d9f1b18 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/DeliveryResource.java
+++ b/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/DeliveryResource.java
@@ -45,16 +45,16 @@ public class DeliveryResource extends AbstractResource {
 
             Element collectionTypeElem = doc.createElement("collectionType");
             collectionTypeElem.setAttribute("name", collectionType);
-            for (CardCollection.Item item : items.getItems(null, _library)) {
-                String blueprintId = item.getBlueprintId();
-                if (item.getType() == CardCollection.Item.Type.CARD) {
+            for (Map.Entry<String, Integer> itemCount : items.getAll().entrySet()) {
+                String blueprintId = itemCount.getKey();
+                if (blueprintId.contains("_")) {
                     Element card = doc.createElement("card");
-                    card.setAttribute("count", String.valueOf(item.getCount()));
+                    card.setAttribute("count", String.valueOf(itemCount.getValue()));
                     card.setAttribute("blueprintId", blueprintId);
                     collectionTypeElem.appendChild(card);
                 } else {
                     Element pack = doc.createElement("pack");
-                    pack.setAttribute("count", String.valueOf(item.getCount()));
+                    pack.setAttribute("count", String.valueOf(itemCount.getValue()));
                     pack.setAttribute("blueprintId", blueprintId);
                     collectionTypeElem.appendChild(pack);
                 }
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/boosters/fotr_tengwar_selection.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/boosters/fotr_tengwar_selection.png
new file mode 100644
index 000000000..059fdf142
Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/boosters/fotr_tengwar_selection.png differ
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/boosters/ttt_starter_selection.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/boosters/ttt_starter_selection.png
new file mode 100644
index 000000000..11b9ab76f
Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/boosters/ttt_starter_selection.png differ
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCardGroup.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCardGroup.js
index c4a471bb0..c1054c9ca 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCardGroup.js
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCardGroup.js
@@ -6,7 +6,7 @@ var CardGroup = Class.extend({
     height: null,
     belongTestFunc: null,
     padding: 5,
-    maxCardHeight: null,
+    maxCardHeight: 497,
     descDiv: null,
 
     init: function(container, belongTest, createDiv) {
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js
index 489747a0d..a85529f38 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js
@@ -1,6 +1,9 @@
 var cardCache = {};
 var cardScale = 357 / 497;
 var packBlueprints = {
+    "(S)FotR - Tengwar": "/gemp-lotr/images/boosters/fotr_tengwar_selection.png",
+    "(S)TTT - Starter": "/gemp-lotr/images/boosters/ttt_starter_selection.png",
+
     "FotR - League Starter": "/gemp-lotr/images/boosters/fotr_league_starter.png",
 
     "FotR - Gandalf Starter": "/gemp-lotr/images/boosters/fotr_gandalf_starter.png",
@@ -25,7 +28,7 @@ var packBlueprints = {
 
     "EoF - Faramir Starter": "/gemp-lotr/images/boosters/eof_faramir_starter.png",
     "EoF - Witch-king Starter": "/gemp-lotr/images/boosters/eof_witch_king_starter.png",
-    "EoF - Booster": "/gemp-lotr/images/boosters/eof_booster.png",
+    "EoF - Booster": "/gemp-lotr/images/boosters/eof_booster.png"
 };
 
 var Card = Class.extend({
@@ -121,8 +124,6 @@ var Card = Class.extend({
     },
 
     getUrlByBlueprintId: function(blueprintId) {
-        if (blueprintId.substr(0, 3) == "(S)")
-            return "/gemp-lotr/images/boosters/selection.png";
         if (packBlueprints[blueprintId] != null)
             return packBlueprints[blueprintId];