diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild2.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild2.html
index 394d86bfd..cf250d9a9 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild2.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild2.html
@@ -11,6 +11,7 @@
     <style type="text/css">
         body {
             font-size: 12px;
+            color: #ffffff;
         }
 
         .panel {
@@ -123,7 +124,7 @@
                         onresize:function () {
                             doLayout();
                         },
-                        north__minSize: 200
+                        north__minSize: 230
                     });
 
                     $("#northPanel").layout({
@@ -131,7 +132,7 @@
                         onresize:function() {
                             doLayout();
                         },
-                        west__minSize: 370
+                        west__minSize: 305
 
                     });
 
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-012/cardFilter2.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-012/cardFilter2.js
index c4b470286..806457cf5 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-012/cardFilter2.js
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-012/cardFilter2.js
@@ -103,7 +103,7 @@ var CardFilter = Class.extend({
         pageElem.append(this.pageDiv);
 
         this.fullFilterDiv = $("<div></div>");
-        this.setSelect = $("<select style='width: 130px; font-size: 80%;'>"
+        this.setSelect = $("<select style='font-size: 75%; float: right'>"
             + "<option value=''>All Sets</option>"
             + "<option value='fotr_block'>Fellowship Block</option>"
             + "<option value='ttt_block'>Towers Block</option>"
@@ -135,9 +135,8 @@ var CardFilter = Class.extend({
             + "<option value='18'>18 - Treachery & Deceit</option>"
             + "<option value='19'>19 - Ages End</option>"
             + "</select>");
-        this.nameInput = $("<input type='text' value='Card name' style='width: 130px; font-size: 70%;'>");
-        this.sortSelect = $("<select style='width: 80px; font-size: 80%;'>"
-            + "<option value=''>Sort by:</option>"
+        this.nameInput = $("<input type='text' style='width: 130px; font-size: 70%; float: right'>");
+        this.sortSelect = $("<select style='font-size: 75%; float: right'>"
             + "<option value='name,collectorInfo'>Name</option>"
             + "<option value='twilight,name,collectorInfo'>Twilight</option>"
             + "<option value='siteNumber,name'>Site number</option>"
@@ -147,8 +146,8 @@ var CardFilter = Class.extend({
             + "<option value='culture,name,collectorInfo'>Culture</option>"
             + "<option value='collectorInfo'>Collector's Info</option>"
             + "</select>");
-        this.raritySelect = $("<select style='width: 40px; font-size: 80%;'>"
-            + "<option value=''>Rarity:</option>"
+        this.raritySelect = $("<select style='font-size: 75%; float: right'>"
+            + "<option value=''>All</option>"
             + "<option value='R'>Rare</option>"
             + "<option value='U'>Uncommon</option>"
             + "<option value='C'>Common</option>"
@@ -158,39 +157,33 @@ var CardFilter = Class.extend({
             + "<option value='S'>Fixed</option>"
             + "</select>");
 
-        this.fullFilterDiv.append(this.setSelect);
-        this.fullFilterDiv.append(this.nameInput);
-        this.fullFilterDiv.append(this.sortSelect);
-        this.fullFilterDiv.append(this.raritySelect);
+        var cardNameDiv = $("<div></div>");
+        cardNameDiv.append("Card name: ");
+        cardNameDiv.append(this.nameInput);
+        this.fullFilterDiv.append(cardNameDiv);
+
+        var sortDiv = $("<div></div>");
+        sortDiv.append("Sort by: ");
+        sortDiv.append(this.sortSelect);
+        this.fullFilterDiv.append(sortDiv);
+
+        var setDiv = $("<div></div>");
+        setDiv.append("Set / Format: ");
+        setDiv.append(this.setSelect);
+        this.fullFilterDiv.append(setDiv);
+
+        var rarityDiv = $("<div></div>");
+        rarityDiv.append("Rarity: ");
+        rarityDiv.append(this.raritySelect);
+        this.fullFilterDiv.append(rarityDiv);
 
         elem.append(this.fullFilterDiv);
 
         this.filterDiv = $("<div></div>");
 
-        this.filterDiv.append("<div id='culture1'>"
-            + "<input type='checkbox' id='DWARVEN'/><label for='DWARVEN' id='labelDWARVEN'><img src='images/cultures/dwarven.png'/></label>"
-            + "<input type='checkbox' id='ELVEN'/><label for='ELVEN' id='labelELVEN'><img src='images/cultures/elven.png'/></label>"
-            + "<input type='checkbox' id='GANDALF'/><label for='GANDALF' id='labelGANDALF'><img src='images/cultures/gandalf.png'/></label>"
-            + "<input type='checkbox' id='GONDOR'/><label for='GONDOR' id='labelGONDOR'><img src='images/cultures/gondor.png'/></label>"
-            + "<input type='checkbox' id='ROHAN'/><label for='ROHAN' id='labelROHAN'><img src='images/cultures/rohan.png'/></label>"
-            + "<input type='checkbox' id='SHIRE'/><label for='SHIRE' id='labelSHIRE'><img src='images/cultures/shire.png'/></label>"
-            + "<input type='checkbox' id='GOLLUM'/><label for='GOLLUM' id='labelGOLLUM'><img src='images/cultures/gollum.png'/></label>"
-            + "</div>");
-        this.filterDiv.append("<div id='culture2'>"
-            + "<input type='checkbox' id='DUNLAND'/><label for='DUNLAND' id='labelDUNLAND'><img src='images/cultures/dunland.png'/></label>"
-            + "<input type='checkbox' id='ISENGARD'/><label for='ISENGARD' id='labelISENGARD'><img src='images/cultures/isengard.png'/></label>"
-            + "<input type='checkbox' id='MEN'/><label for='MEN' id='labelMEN'><img src='images/cultures/men.png'/></label>"
-            + "<input type='checkbox' id='MORIA'/><label for='MORIA' id='labelMORIA'><img src='images/cultures/moria.png'/></label>"
-            + "<input type='checkbox' id='ORC'/><label for='ORC' id='labelORC'><img src='images/cultures/orc.png'/></label>"
-            + "<input type='checkbox' id='RAIDER'/><label for='RAIDER' id='labelRAIDER'><img src='images/cultures/raider.png'/></label>"
-            + "<input type='checkbox' id='SAURON'/><label for='SAURON' id='labelSAURON'><img src='images/cultures/sauron.png'/></label>"
-            + "<input type='checkbox' id='URUK_HAI'/><label for='URUK_HAI' id='labelURUK_HAI'><img src='images/cultures/uruk_hai.png'/></label>"
-            + "<input type='checkbox' id='WRAITH'/><label for='WRAITH' id='labelWRAITH'><img src='images/cultures/wraith.png'/></label>"
-            + "</div>");
-
-        var combos = $("<div></div>");
-
-        combos.append(" <select id='cardType' style='font-size: 80%;'>"
+        var cardTypeDiv = $("<div></div>");
+        cardTypeDiv.append("Card type: ");
+        cardTypeDiv.append("<select id='cardType' style='font-size: 75%; float: right'>"
             + "<option value=''>All Card Types</option>"
             + "<option value='COMPANION,ALLY,MINION'>Characters</option>"
             + "<option value='POSSESSION,ARTIFACT'>Items</option>"
@@ -204,7 +197,11 @@ var CardFilter = Class.extend({
             + "<option value='MINION'>Minions</option>"
             + "<option value='POSSESSION'>Possessions</option>"
             + "</select>");
-        combos.append(" <select id='keyword' style='font-size: 80%;'>"
+        this.filterDiv.append(cardTypeDiv);
+
+        var keywordDiv = $("<div></div>");
+        keywordDiv.append("Keyword: ");
+        keywordDiv.append(" <select id='keyword' style='font-size: 75%; float: right'>"
             + "<option value=''>No keyword filtering</option>"
             + "<option value='ARCHER'>Archer</option>"
             + "<option value='BATTLEGROUND'>Battleground</option>"
@@ -244,7 +241,11 @@ var CardFilter = Class.extend({
             + "<option value='WARG_RIDER'>Warg-rider</option>"
             + "<option value='WEATHER'>Weather</option>"
             + "</select>");
-        combos.append(" <select id='type' style='font-size: 80%'>"
+        this.filterDiv.append(keywordDiv);
+
+        var typeDiv = $("<div></div>");
+        typeDiv.append("Item type: ");
+        typeDiv.append("<select id='type' style='font-size: 75%; float: right'>"
             + "<option value=''>All types</option>"
             + "<option value='pack'>Packs</option>"
             + "<option value='card'>Cards</option>"
@@ -252,7 +253,30 @@ var CardFilter = Class.extend({
             + "<option value='nonFoil'>Non-foils</option>"
             + "<option value='tengwar'>Tengwar</option>"
             + "</select>");
-        this.filterDiv.append(combos);
+        this.filterDiv.append(typeDiv);
+
+        this.filterDiv.append("Cultures:");
+
+        this.filterDiv.append("<div id='culture1'>"
+            + "<input type='checkbox' id='DWARVEN'/><label for='DWARVEN' id='labelDWARVEN'><img src='images/cultures/dwarven.png' height='15'/></label>"
+            + "<input type='checkbox' id='ELVEN'/><label for='ELVEN' id='labelELVEN'><img src='images/cultures/elven.png' height='15'/></label>"
+            + "<input type='checkbox' id='GANDALF'/><label for='GANDALF' id='labelGANDALF'><img src='images/cultures/gandalf.png' height='15'/></label>"
+            + "<input type='checkbox' id='GONDOR'/><label for='GONDOR' id='labelGONDOR'><img src='images/cultures/gondor.png' height='15'/></label>"
+            + "<input type='checkbox' id='ROHAN'/><label for='ROHAN' id='labelROHAN'><img src='images/cultures/rohan.png' height='15'/></label>"
+            + "<input type='checkbox' id='SHIRE'/><label for='SHIRE' id='labelSHIRE'><img src='images/cultures/shire.png' height='15'/></label>"
+            + "<input type='checkbox' id='GOLLUM'/><label for='GOLLUM' id='labelGOLLUM'><img src='images/cultures/gollum.png' height='15'/></label>"
+            + "</div>");
+        this.filterDiv.append("<div id='culture2'>"
+            + "<input type='checkbox' id='DUNLAND'/><label for='DUNLAND' id='labelDUNLAND'><img src='images/cultures/dunland.png' height='15'/></label>"
+            + "<input type='checkbox' id='ISENGARD'/><label for='ISENGARD' id='labelISENGARD'><img src='images/cultures/isengard.png' height='15'/></label>"
+            + "<input type='checkbox' id='MEN'/><label for='MEN' id='labelMEN'><img src='images/cultures/men.png' height='15'/></label>"
+            + "<input type='checkbox' id='MORIA'/><label for='MORIA' id='labelMORIA'><img src='images/cultures/moria.png' height='15'/></label>"
+            + "<input type='checkbox' id='ORC'/><label for='ORC' id='labelORC'><img src='images/cultures/orc.png' height='15'/></label>"
+            + "<input type='checkbox' id='RAIDER'/><label for='RAIDER' id='labelRAIDER'><img src='images/cultures/raider.png' height='15'/></label>"
+            + "<input type='checkbox' id='SAURON'/><label for='SAURON' id='labelSAURON'><img src='images/cultures/sauron.png' height='15'/></label>"
+            + "<input type='checkbox' id='URUK_HAI'/><label for='URUK_HAI' id='labelURUK_HAI'><img src='images/cultures/uruk_hai.png' height='15'/></label>"
+            + "<input type='checkbox' id='WRAITH'/><label for='WRAITH' id='labelWRAITH'><img src='images/cultures/wraith.png' height='15'/></label>"
+            + "</div>");
 
         elem.append(this.filterDiv);
 
@@ -345,14 +369,10 @@ var CardFilter = Class.extend({
             sort = " sort:" + sort;
 
         var cardName = this.nameInput.val();
-        if (cardName == "Card name")
-            cardName = "";
-        else {
-            var cardNameElems = cardName.split(" ");
-            cardName = "";
-            for (var i = 0; i < cardNameElems.length; i++)
-                cardName += " name:" + cardNameElems[i];
-        }
+        var cardNameElems = cardName.split(" ");
+        cardName = "";
+        for (var i = 0; i < cardNameElems.length; i++)
+            cardName += " name:" + cardNameElems[i];
 
         var rarity = $("option:selected", this.raritySelect).prop("value");
         if (rarity != "")
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-012/deckBuildingUi2.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-012/deckBuildingUi2.js
index ebce2a8db..918bbf7cc 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-012/deckBuildingUi2.js
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-012/deckBuildingUi2.js
@@ -6,6 +6,8 @@ var GempLotrDeckBuildingUI2 = Class.extend({
     collectionContainer:null,
     collectionGroup:null,
 
+    collectionSelect: null,
+
     deckDiv: null,
 
     cardFilter:null,
@@ -42,7 +44,28 @@ var GempLotrDeckBuildingUI2 = Class.extend({
 
         this.comm = new GempLotrCommunication("/gemp-lotr-server", that.processError);
 
-        this.cardFilter = new CardFilter(filterDiv, pageDiv,
+        var collectionTypeDiv = $("<div></div>");
+        var filterDivInternal = $("<div></div>");
+
+        collectionTypeDiv.append("Collection: ");
+
+        this.collectionSelect = $("<select></select>");
+        this.collectionSelect.css({"float":"right", "width":"180px", "font-size": "75%"});
+        this.collectionSelect.append("<option value='default'>All cards</option>");
+        this.collectionSelect.append("<option value='permanent'>My cards</option>");
+
+        collectionTypeDiv.append(this.collectionSelect);
+
+        this.collectionSelect.change(
+            function () {
+                that.collectionType = $("option:selected", this.collectionSelect).prop("value");
+                that.cardFilter.getCollection();
+            });
+
+        filterDiv.append(collectionTypeDiv);
+        filterDiv.append(filterDivInternal);
+
+        this.cardFilter = new CardFilter(filterDivInternal, pageDiv,
                 function (filter, start, count, callback) {
                     that.comm.getCollection(that.collectionType, filter, start, count, function (xml) {
                         callback(xml);
@@ -81,6 +104,8 @@ var GempLotrDeckBuildingUI2 = Class.extend({
                 function (event) {
                     return that.dragStopCardFunction(event);
                 });
+
+        this.loadExtraCollectionTypes();
     },
 
     dragCardProps:null,
@@ -161,6 +186,21 @@ var GempLotrDeckBuildingUI2 = Class.extend({
         return true;
     },
 
+    loadExtraCollectionTypes:function () {
+        var that = this;
+        this.comm.getCollectionTypes(
+            function (xml) {
+                var root = xml.documentElement;
+                if (root.tagName == "collections") {
+                    var collections = root.getElementsByTagName("collection");
+                    for (var i = 0; i < collections.length; i++) {
+                        var collection = collections[i];
+                        this.collectionSelect.append("<option value='" + collection.getAttribute("type") + "'>" + collection.getAttribute("name") + "</option>");
+                    }
+                }
+            });
+    },
+
     layoutCollectionContainer : function(cardGroups, left, top, width, height) {
         var padding = 3;
         cardGroups["main"].setLayout(left + padding, top + padding, width - 2 * padding, height - 2 * padding);