diff --git a/ankiqt/ui/clayout.py b/ankiqt/ui/clayout.py
index 046799966..f02a55eb3 100644
--- a/ankiqt/ui/clayout.py
+++ b/ankiqt/ui/clayout.py
@@ -49,15 +49,21 @@ class CardLayout(QDialog):
             sys.platform.startswith("win32")):
             self.plastiqueStyle = QStyleFactory.create("plastique")
         if self.card:
-            # limited to an existing card
-            self.cards = [self.card]
+            # limited to an existing templates
+            self.cards = [self.deck.s.query(Card).get(id) for id in
+                          self.deck.s.column0(
+                "select id from cards where factId = :fid "
+                "order by ordinal", fid=self.fact.id)]
+            type = 0
         else:
             if factedit:
                 # active & possible
                 self.cards = self.deck.previewFact(self.fact)
+                type = 1
             else:
                 # all
                 self.cards = self.deck.previewFact(self.fact, cms=self.model.cardModels)
+                type = 2
             if not self.cards:
                 ui.utils.showInfo(_(
                     "Please enter some text first."),
@@ -65,6 +71,15 @@ class CardLayout(QDialog):
                 return
         self.form = ankiqt.forms.clayout.Ui_Dialog()
         self.form.setupUi(self)
+        if type == 0:
+            self.form.templateType.setText(
+                _("Templates used by fact:"))
+        elif type == 1:
+            self.form.templateType.setText(
+                _("Templates that will be created:"))
+        else:
+            self.form.templateType.setText(
+                _("All templates:"))
         # FIXME: add this
         self.form.editTemplates.hide()
         self.connect(self.form.buttonBox, SIGNAL("helpRequested()"),
@@ -205,12 +220,21 @@ order by n""", id=card.id)
 
     def fillCardList(self):
         self.form.cardList.clear()
+        cards = []
+        idx = 0
+        for n, c in enumerate(self.cards):
+            if c == self.card:
+                cards.append(_("%s (current)") % c.cardModel.name)
+                idx = n
+            else:
+                cards.append(c.cardModel.name)
         self.form.cardList.addItems(
-            QStringList([c.cardModel.name for c in self.cards]))
-        if [self.card] == self.cards:
-            self.form.cardList.setEnabled(False)
-            self.form.editTemplates.setEnabled(False)
-        self.cardChanged(0)
+            QStringList(cards))
+        self.form.editTemplates.setEnabled(False)
+        if idx != 0:
+            self.form.cardList.setCurrentIndex(idx)
+        self.cardChanged(idx)
+        self.form.cardList.setFocus()
 
     def cardChanged(self, idx):
         self.card = self.cards[idx]
diff --git a/designer/clayout.ui b/designer/clayout.ui
index d9d4b11ff..aa049ffe1 100644
--- a/designer/clayout.ui
+++ b/designer/clayout.ui
@@ -40,7 +40,7 @@
            <property name="spacing">
             <number>6</number>
            </property>
-           <item row="1" column="1">
+           <item row="3" column="1">
             <widget class="QTextEdit" name="cardQuestion">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -62,7 +62,7 @@
              </property>
             </widget>
            </item>
-           <item row="2" column="1">
+           <item row="4" column="1">
             <widget class="QTextEdit" name="cardAnswer">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -87,17 +87,7 @@
              </property>
             </widget>
            </item>
-           <item row="0" column="0">
-            <widget class="QLabel" name="label_3">
-             <property name="text">
-              <string>Template</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="1">
+           <item row="1" column="0" colspan="2">
             <layout class="QHBoxLayout" name="horizontalLayout_2">
              <item>
               <widget class="QComboBox" name="cardList">
@@ -118,7 +108,7 @@
              </item>
             </layout>
            </item>
-           <item row="1" column="0" rowspan="2">
+           <item row="3" column="0" rowspan="2">
             <layout class="QVBoxLayout" name="verticalLayout_6">
              <item>
               <widget class="QLabel" name="label_14">
@@ -159,7 +149,7 @@
              </item>
             </layout>
            </item>
-           <item row="3" column="0">
+           <item row="5" column="0">
             <widget class="QLabel" name="label_13">
              <property name="text">
               <string>Alignment</string>
@@ -169,10 +159,10 @@
              </property>
             </widget>
            </item>
-           <item row="3" column="1">
+           <item row="5" column="1">
             <widget class="QComboBox" name="alignment"/>
            </item>
-           <item row="4" column="0">
+           <item row="6" column="0">
             <widget class="QLabel" name="label_16">
              <property name="text">
               <string>Background</string>
@@ -182,7 +172,7 @@
              </property>
             </widget>
            </item>
-           <item row="4" column="1">
+           <item row="6" column="1">
             <widget class="QPushButton" name="background">
              <property name="text">
               <string/>
@@ -192,6 +182,13 @@
              </property>
             </widget>
            </item>
+           <item row="0" column="0" colspan="2">
+            <widget class="QLabel" name="templateType">
+             <property name="text">
+              <string/>
+             </property>
+            </widget>
+           </item>
           </layout>
          </item>
          <item>