Update table selection.

Mage.Client/src/main/java/mage/client/table/TablesPanel.form

@@ -26,14 +26,14 @@
     <DimensionLayout dim="1">
       <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" alignment="0" attributes="0">
-              <Component id="jPanel1" min="-2" max="-2" attributes="0"/>
+              <Component id="jPanel1" max="-2" attributes="0"/>
               <EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
               <Component id="jSplitPane1" max="32767" attributes="0"/>
               <EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
               <Component id="jPanel2" min="-2" pref="25" max="-2" attributes="0"/>
           </Group>
           <Group type="103" rootIndex="1" groupAlignment="0" attributes="0">
-              <EmptySpace min="0" pref="584" max="32767" attributes="0"/>
+              <EmptySpace min="0" pref="598" max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -50,11 +50,17 @@
                   <EmptySpace min="-2" pref="6" max="-2" attributes="0"/>
                   <Component id="btnNewTournament" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="0" max="-2" attributes="0">
+                      <Component id="filterStateBar" max="32767" attributes="0"/>
+                      <Component id="filterTypeBar" max="32767" attributes="0"/>
+                  </Group>
+                  <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="0" max="-2" attributes="0">
+                      <Component id="filterFormatBar2" max="-2" attributes="0"/>
+                      <Component id="filterFormatBar1" max="-2" attributes="0"/>
+                  </Group>
+                  <EmptySpace max="-2" attributes="0"/>
                   <Component id="btnQuickStart" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace max="-2" attributes="0"/>
-                  <Component id="chkShowCompleted" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace max="-2" attributes="0"/>
-                  <Component id="cbStatusFilter" min="-2" pref="140" max="-2" attributes="0"/>
                   <EmptySpace max="32767" attributes="0"/>
               </Group>
           </Group>
@@ -63,14 +69,28 @@
           <Group type="103" groupAlignment="0" attributes="0">
               <Group type="102" alignment="0" attributes="0">
                   <EmptySpace max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="0" attributes="0">
                       <Group type="103" groupAlignment="3" attributes="0">
                           <Component id="btnNewTable" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="btnQuickStart" alignment="3" min="-2" max="-2" attributes="0"/>
                           <Component id="btnNewTournament" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="chkShowCompleted" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="cbStatusFilter" alignment="3" min="-2" max="-2" attributes="0"/>
                       </Group>
-                  <EmptySpace pref="16" max="32767" attributes="0"/>
+                      <Group type="103" alignment="0" groupAlignment="0" max="-2" attributes="0">
+                          <Group type="102" attributes="0">
+                              <Component id="filterStateBar" min="-2" pref="25" max="-2" attributes="0"/>
+                              <EmptySpace max="-2" attributes="0"/>
+                              <Component id="filterTypeBar" min="-2" pref="25" max="-2" attributes="0"/>
+                          </Group>
+                          <Group type="102" attributes="0">
+                              <Group type="103" groupAlignment="1" attributes="0">
+                                  <Component id="filterFormatBar1" min="-2" pref="25" max="-2" attributes="0"/>
+                                  <Component id="btnQuickStart" min="-2" max="-2" attributes="0"/>
+                              </Group>
+                              <EmptySpace max="32767" attributes="0"/>
+                              <Component id="filterFormatBar2" min="-2" pref="25" max="-2" attributes="0"/>
+                          </Group>
+                      </Group>
+                  </Group>
+                  <EmptySpace max="-2" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
@@ -78,53 +98,309 @@
       <SubComponents>
         <Component class="javax.swing.JButton" name="btnNewTable">
           <Properties>
-            <Property name="text" type="java.lang.String" value="New Match"/>
+            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="3" name="/buttons/match_new.png"/>
+            </Property>
+            <Property name="toolTipText" type="java.lang.String" value="Creates a new match table."/>
+            <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
+              <Insets value="[10, 10, 10, 10]"/>
+            </Property>
           </Properties>
           <Events>
             <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnNewTableActionPerformed"/>
           </Events>
         </Component>
-        <Component class="javax.swing.JButton" name="btnQuickStart">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="Quick Start"/>
-          </Properties>
-          <Events>
-            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnQuickStartActionPerformed"/>
-          </Events>
-        </Component>
         <Component class="javax.swing.JButton" name="btnNewTournament">
           <Properties>
-            <Property name="text" type="java.lang.String" value="New Tournament"/>
+            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="3" name="/buttons/tourney_new.png"/>
+            </Property>
+            <Property name="toolTipText" type="java.lang.String" value="Creates a new tourney table."/>
+            <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
+              <Insets value="[10, 10, 10, 10]"/>
+            </Property>
           </Properties>
           <Events>
             <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnNewTournamentActionPerformed"/>
           </Events>
         </Component>
-        <Component class="javax.swing.JCheckBox" name="chkShowCompleted">
+        <Container class="javax.swing.JToolBar" name="filterStateBar">
           <Properties>
+            <Property name="floatable" type="boolean" value="false"/>
+            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+              <Color blue="ff" green="66" red="66" type="rgb"/>
+            </Property>
+            <Property name="focusable" type="boolean" value="false"/>
+          </Properties>
+
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout"/>
+          <SubComponents>
+            <Component class="javax.swing.JToggleButton" name="btnStateWaiting">
+              <Properties>
+                <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/buttons/state_waiting_off.png"/>
+                </Property>
                 <Property name="selected" type="boolean" value="true"/>
-            <Property name="text" type="java.lang.String" value="Show Completed"/>
-            <Property name="toolTipText" type="java.lang.String" value="&lt;HTML&gt;Toggles the visibility of the table of completed&#xa;&lt;br&gt;matches and tournaments in the lower area"/>
+                <Property name="toolTipText" type="java.lang.String" value="Show tables waiting for players."/>
+                <Property name="actionCommand" type="java.lang.String" value="stateWait"/>
+                <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+                  <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
+                    <EmptyBorder/>
+                  </Border>
+                </Property>
+                <Property name="focusPainted" type="boolean" value="false"/>
+                <Property name="focusable" type="boolean" value="false"/>
+                <Property name="horizontalTextPosition" type="int" value="0"/>
+                <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[27, 27]"/>
+                </Property>
+                <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[27, 27]"/>
+                </Property>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[23, 23]"/>
+                </Property>
+                <Property name="requestFocusEnabled" type="boolean" value="false"/>
+                <Property name="rolloverEnabled" type="boolean" value="false"/>
+                <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/buttons/state_waiting.png"/>
+                </Property>
+                <Property name="verticalTextPosition" type="int" value="3"/>
               </Properties>
               <Events>
-            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="chkShowCompletedActionPerformed"/>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnStateWaitingActionPerformed"/>
               </Events>
             </Component>
-        <Component class="javax.swing.JComboBox" name="cbStatusFilter">
+            <Component class="javax.swing.JToggleButton" name="btnStateActive">
               <Properties>
-            <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-              <StringArray count="2">
-                <StringItem index="0" value="All tables"/>
-                <StringItem index="1" value="Waiting for players"/>
-              </StringArray>
+                <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/buttons/state_active.png"/>
                 </Property>
+                <Property name="selected" type="boolean" value="true"/>
+                <Property name="toolTipText" type="java.lang.String" value="Show tables with active matches."/>
+                <Property name="actionCommand" type="java.lang.String" value="stateActive"/>
+                <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+                  <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
+                    <EmptyBorder/>
+                  </Border>
+                </Property>
+                <Property name="focusPainted" type="boolean" value="false"/>
+                <Property name="focusable" type="boolean" value="false"/>
+                <Property name="horizontalTextPosition" type="int" value="0"/>
+                <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[27, 27]"/>
+                </Property>
+                <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[27, 27]"/>
+                </Property>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[23, 23]"/>
+                </Property>
+                <Property name="requestFocusEnabled" type="boolean" value="false"/>
+                <Property name="rolloverEnabled" type="boolean" value="false"/>
+                <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/buttons/state_active.png"/>
+                </Property>
+                <Property name="verticalTextPosition" type="int" value="3"/>
               </Properties>
               <Events>
-            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cbStatusFilterActionPerformed"/>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnStateActiveActionPerformed"/>
+              </Events>
+            </Component>
+            <Component class="javax.swing.JToggleButton" name="btnStateFinished">
+              <Properties>
+                <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/buttons/state_finished.png"/>
+                </Property>
+                <Property name="selected" type="boolean" value="true"/>
+                <Property name="toolTipText" type="java.lang.String" value="&lt;HTML&gt;Toggles the visibility of the table of completed &lt;br&gt;matches and tournaments in the lower area.&#xa;&lt;br&gt;Showing the last 50 finished matches."/>
+                <Property name="actionCommand" type="java.lang.String" value="stateFinished"/>
+                <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+                  <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
+                    <EmptyBorder/>
+                  </Border>
+                </Property>
+                <Property name="focusPainted" type="boolean" value="false"/>
+                <Property name="focusable" type="boolean" value="false"/>
+                <Property name="horizontalTextPosition" type="int" value="0"/>
+                <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[27, 27]"/>
+                </Property>
+                <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[27, 27]"/>
+                </Property>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[23, 23]"/>
+                </Property>
+                <Property name="requestFocusEnabled" type="boolean" value="false"/>
+                <Property name="rolloverEnabled" type="boolean" value="false"/>
+                <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/buttons/state_finished.png"/>
+                </Property>
+                <Property name="verticalTextPosition" type="int" value="3"/>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnStateFinishedActionPerformed"/>
+              </Events>
+            </Component>
+          </SubComponents>
+        </Container>
+        <Container class="javax.swing.JToolBar" name="filterTypeBar">
+          <Properties>
+            <Property name="floatable" type="boolean" value="false"/>
+            <Property name="focusable" type="boolean" value="false"/>
+          </Properties>
+
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout"/>
+          <SubComponents>
+            <Component class="javax.swing.JToggleButton" name="btnTypeMatch">
+              <Properties>
+                <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/buttons/type_match.png"/>
+                </Property>
+                <Property name="selected" type="boolean" value="true"/>
+                <Property name="actionCommand" type="java.lang.String" value="typeMatch"/>
+                <Property name="focusable" type="boolean" value="false"/>
+                <Property name="horizontalTextPosition" type="int" value="0"/>
+                <Property name="verticalTextPosition" type="int" value="3"/>
+              </Properties>
+            </Component>
+            <Component class="javax.swing.JToggleButton" name="btnTypeTourneyConstructed">
+              <Properties>
+                <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/buttons/type_tourney_construced.png"/>
+                </Property>
+                <Property name="selected" type="boolean" value="true"/>
+                <Property name="actionCommand" type="java.lang.String" value="typeTourneyConstructed"/>
+                <Property name="focusable" type="boolean" value="false"/>
+                <Property name="horizontalTextPosition" type="int" value="0"/>
+                <Property name="verticalTextPosition" type="int" value="3"/>
+              </Properties>
+            </Component>
+            <Component class="javax.swing.JToggleButton" name="btnTypeTourneyLimited">
+              <Properties>
+                <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/buttons/type_tourney_limited.png"/>
+                </Property>
+                <Property name="selected" type="boolean" value="true"/>
+                <Property name="actionCommand" type="java.lang.String" value="typeTourneyLimited"/>
+                <Property name="focusable" type="boolean" value="false"/>
+                <Property name="horizontalTextPosition" type="int" value="0"/>
+                <Property name="verticalTextPosition" type="int" value="3"/>
+              </Properties>
+            </Component>
+          </SubComponents>
+        </Container>
+        <Container class="javax.swing.JToolBar" name="filterFormatBar1">
+          <Properties>
+            <Property name="floatable" type="boolean" value="false"/>
+            <Property name="focusable" type="boolean" value="false"/>
+          </Properties>
+
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout"/>
+          <SubComponents>
+            <Component class="javax.swing.JToggleButton" name="btnFormatBlock">
+              <Properties>
+                <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/buttons/format_block.png"/>
+                </Property>
+                <Property name="selected" type="boolean" value="true"/>
+                <Property name="focusable" type="boolean" value="false"/>
+                <Property name="horizontalTextPosition" type="int" value="0"/>
+                <Property name="verticalTextPosition" type="int" value="3"/>
+              </Properties>
+            </Component>
+            <Component class="javax.swing.JToggleButton" name="btnFormatStandard">
+              <Properties>
+                <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/buttons/format_standard.png"/>
+                </Property>
+                <Property name="selected" type="boolean" value="true"/>
+                <Property name="focusable" type="boolean" value="false"/>
+                <Property name="horizontalTextPosition" type="int" value="0"/>
+                <Property name="verticalTextPosition" type="int" value="3"/>
+              </Properties>
+            </Component>
+            <Component class="javax.swing.JToggleButton" name="btnFormatModern">
+              <Properties>
+                <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/buttons/format_modern.png"/>
+                </Property>
+                <Property name="selected" type="boolean" value="true"/>
+              </Properties>
+            </Component>
+            <Component class="javax.swing.JToggleButton" name="btnFormatCommander">
+              <Properties>
+                <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/buttons/format_commander.png"/>
+                </Property>
+                <Property name="selected" type="boolean" value="true"/>
+                <Property name="focusable" type="boolean" value="false"/>
+                <Property name="horizontalTextPosition" type="int" value="0"/>
+                <Property name="verticalTextPosition" type="int" value="3"/>
+              </Properties>
+            </Component>
+          </SubComponents>
+        </Container>
+        <Container class="javax.swing.JToolBar" name="filterFormatBar2">
+          <Properties>
+            <Property name="floatable" type="boolean" value="false"/>
+            <Property name="toolTipText" type="java.lang.String" value="All tables with active matches"/>
+            <Property name="focusable" type="boolean" value="false"/>
+          </Properties>
+
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout"/>
+          <SubComponents>
+            <Component class="javax.swing.JToggleButton" name="btnFormatLegacy">
+              <Properties>
+                <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/buttons/format_legacy.png"/>
+                </Property>
+                <Property name="selected" type="boolean" value="true"/>
+                <Property name="focusable" type="boolean" value="false"/>
+                <Property name="horizontalTextPosition" type="int" value="0"/>
+                <Property name="verticalTextPosition" type="int" value="3"/>
+              </Properties>
+            </Component>
+            <Component class="javax.swing.JToggleButton" name="btnFormatVintage">
+              <Properties>
+                <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/buttons/format_vintage.png"/>
+                </Property>
+                <Property name="selected" type="boolean" value="true"/>
+                <Property name="focusable" type="boolean" value="false"/>
+                <Property name="horizontalTextPosition" type="int" value="0"/>
+                <Property name="verticalTextPosition" type="int" value="3"/>
+              </Properties>
+            </Component>
+            <Component class="javax.swing.JToggleButton" name="btnFormatOther">
+              <Properties>
+                <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/buttons/format_other.png"/>
+                </Property>
+                <Property name="selected" type="boolean" value="true"/>
+              </Properties>
+            </Component>
+            <Component class="javax.swing.JToggleButton" name="btnFormatTinyLeader">
+              <Properties>
+                <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/buttons/format_tiny_leader.png"/>
+                </Property>
+                <Property name="selected" type="boolean" value="true"/>
+              </Properties>
+            </Component>
+          </SubComponents>
+        </Container>
+        <Component class="javax.swing.JButton" name="btnQuickStart">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Quick Start"/>
+            <Property name="focusable" type="boolean" value="false"/>
+            <Property name="horizontalTextPosition" type="int" value="0"/>
+            <Property name="verticalTextPosition" type="int" value="3"/>
+          </Properties>
+          <Events>
+            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnQuickStartActionPerformed"/>
           </Events>
-          <AuxValues>
-            <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value=""/>
-          </AuxValues>
         </Component>
       </SubComponents>
     </Container>
@@ -241,7 +517,7 @@
             </DimensionLayout>
             <DimensionLayout dim="1">
               <Group type="103" groupAlignment="0" attributes="0">
-                  <Component id="jSplitPane2" alignment="0" pref="505" max="32767" attributes="0"/>
+                  <Component id="jSplitPane2" alignment="0" pref="494" max="32767" attributes="0"/>
               </Group>
             </DimensionLayout>
           </Layout>

Mage.Client/src/main/java/mage/client/table/TablesPanel.java

@@ -121,7 +121,18 @@ public class TablesPanel extends javax.swing.JPanel {
         initComponents();
         tableModel.setSession(session);
 
-        chkShowCompleted.setVisible(true);
+        
+        filterStateBar.setBackground(new Color(250, 250, 250, 150));
+        filterStateBar.setOpaque(true); // false = transparent
+
+        filterTypeBar.setBackground(new Color(250, 250, 250, 150));
+        filterTypeBar.setOpaque(true); // false = transparent
+
+        filterFormatBar1.setBackground(new Color(250, 250, 250, 150));
+        filterFormatBar1.setOpaque(true); // false = transparent
+
+        filterFormatBar2.setBackground(new Color(250, 250, 250, 150));
+        filterFormatBar2.setOpaque(true); // false = transparent
 
         tableTables.createDefaultColumnsFromModel();
         activeTablesSorter = new MageTableRowSorter(tableModel);
@@ -279,8 +290,8 @@ public class TablesPanel extends javax.swing.JPanel {
                 if (location != null && jSplitPane1 != null) {
                     jSplitPane1.setDividerLocation(Integer.parseInt(location));
                 }
-                this.chkShowCompleted.setSelected(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_TABLES_SHOW_COMPLETED, "Yes").equals("Yes"));
-                if (this.chkShowCompleted.isSelected()) {
+                this.btnStateFinished.setSelected(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_TABLES_SHOW_COMPLETED, "Yes").equals("Yes"));
+                if (this.btnStateFinished.isSelected()) {
                     this.jSplitPane2.setDividerLocation(-1);
                 }
                 else {
@@ -336,7 +347,7 @@ public class TablesPanel extends javax.swing.JPanel {
                 updatePlayersTask = new UpdatePlayersTask(session, roomId, this.chatPanel);
                 updatePlayersTask.execute();
             }
-            if (this.chkShowCompleted.isSelected()) {
+            if (this.btnStateFinished.isSelected()) {
                 if (updateMatchesTask == null || updateMatchesTask.isDone()) {
                     updateMatchesTask = new UpdateMatchesTask(session, roomId, this);
                     updateMatchesTask.execute();
@@ -447,12 +458,19 @@ public class TablesPanel extends javax.swing.JPanel {
     }
 
     private void activeTablesFilter() {
-        if (cbStatusFilter.getSelectedItem().toString().equals("All tables")) {
-            activeTablesSorter.setRowFilter(null);
-        } else {
-            activeTablesSorter.setRowFilter(RowFilter.regexFilter("Waiting for players", 4));
+        // state
+        StringBuilder stateFilter = new StringBuilder();
+        if (btnStateWaiting.isSelected()) {
+            stateFilter.append("Waiting");
         }
-        
+        if (btnStateActive.isSelected()) {
+            if (stateFilter.length() > 0) {
+                stateFilter.append("|");
+            }            
+            stateFilter.append("Dueling|Constructing|Drafting|Sideboard");
+        }        
+        RowFilter rf = RowFilter.regexFilter(stateFilter.toString(), 4);
+        activeTablesSorter.setRowFilter(rf);        
     }
     
     /** This method is called from within the constructor to
@@ -466,10 +484,26 @@ public class TablesPanel extends javax.swing.JPanel {
 
         jPanel1 = new javax.swing.JPanel();
         btnNewTable = new javax.swing.JButton();
-        btnQuickStart = new javax.swing.JButton();
         btnNewTournament = new javax.swing.JButton();
-        chkShowCompleted = new javax.swing.JCheckBox();
-        cbStatusFilter = new javax.swing.JComboBox();
+        filterStateBar = new javax.swing.JToolBar();
+        btnStateWaiting = new javax.swing.JToggleButton();
+        btnStateActive = new javax.swing.JToggleButton();
+        btnStateFinished = new javax.swing.JToggleButton();
+        filterTypeBar = new javax.swing.JToolBar();
+        btnTypeMatch = new javax.swing.JToggleButton();
+        btnTypeTourneyConstructed = new javax.swing.JToggleButton();
+        btnTypeTourneyLimited = new javax.swing.JToggleButton();
+        filterFormatBar1 = new javax.swing.JToolBar();
+        btnFormatBlock = new javax.swing.JToggleButton();
+        btnFormatStandard = new javax.swing.JToggleButton();
+        btnFormatModern = new javax.swing.JToggleButton();
+        btnFormatCommander = new javax.swing.JToggleButton();
+        filterFormatBar2 = new javax.swing.JToolBar();
+        btnFormatLegacy = new javax.swing.JToggleButton();
+        btnFormatVintage = new javax.swing.JToggleButton();
+        btnFormatOther = new javax.swing.JToggleButton();
+        btnFormatTinyLeader = new javax.swing.JToggleButton();
+        btnQuickStart = new javax.swing.JButton();
         jPanel2 = new javax.swing.JPanel();
         jLabel1 = new javax.swing.JLabel();
         jLabel2 = new javax.swing.JLabel();
@@ -483,40 +517,182 @@ public class TablesPanel extends javax.swing.JPanel {
         jScrollPane2 = new javax.swing.JScrollPane();
         tableCompleted = new javax.swing.JTable();
 
-        btnNewTable.setText("New Match");
+        btnNewTable.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/match_new.png"))); // NOI18N
+        btnNewTable.setToolTipText("Creates a new match table.");
+        btnNewTable.setMargin(new java.awt.Insets(10, 10, 10, 10));
         btnNewTable.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 btnNewTableActionPerformed(evt);
             }
         });
 
-        btnQuickStart.setText("Quick Start");
-        btnQuickStart.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                btnQuickStartActionPerformed(evt);
-            }
-        });
-
-        btnNewTournament.setText("New Tournament");
+        btnNewTournament.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/tourney_new.png"))); // NOI18N
+        btnNewTournament.setToolTipText("Creates a new tourney table.");
+        btnNewTournament.setMargin(new java.awt.Insets(10, 10, 10, 10));
         btnNewTournament.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 btnNewTournamentActionPerformed(evt);
             }
         });
 
-        chkShowCompleted.setSelected(true);
-        chkShowCompleted.setText("Show Completed");
-        chkShowCompleted.setToolTipText("<HTML>Toggles the visibility of the table of completed\n<br>matches and tournaments in the lower area");
-        chkShowCompleted.addActionListener(new java.awt.event.ActionListener() {
+        filterStateBar.setFloatable(false);
+        filterStateBar.setForeground(new java.awt.Color(102, 102, 255));
+        filterStateBar.setFocusable(false);
+
+        btnStateWaiting.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/state_waiting_off.png"))); // NOI18N
+        btnStateWaiting.setSelected(true);
+        btnStateWaiting.setToolTipText("Show tables waiting for players.");
+        btnStateWaiting.setActionCommand("stateWait");
+        btnStateWaiting.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
+        btnStateWaiting.setFocusPainted(false);
+        btnStateWaiting.setFocusable(false);
+        btnStateWaiting.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+        btnStateWaiting.setMaximumSize(new java.awt.Dimension(27, 27));
+        btnStateWaiting.setMinimumSize(new java.awt.Dimension(27, 27));
+        btnStateWaiting.setPreferredSize(new java.awt.Dimension(23, 23));
+        btnStateWaiting.setRequestFocusEnabled(false);
+        btnStateWaiting.setRolloverEnabled(false);
+        btnStateWaiting.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/state_waiting.png"))); // NOI18N
+        btnStateWaiting.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+        btnStateWaiting.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
-                chkShowCompletedActionPerformed(evt);
+                btnStateWaitingActionPerformed(evt);
             }
         });
+        filterStateBar.add(btnStateWaiting);
 
-        cbStatusFilter.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "All tables", "Waiting for players" }));
-        cbStatusFilter.addActionListener(new java.awt.event.ActionListener() {
+        btnStateActive.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/state_active.png"))); // NOI18N
+        btnStateActive.setSelected(true);
+        btnStateActive.setToolTipText("Show tables with active matches.");
+        btnStateActive.setActionCommand("stateActive");
+        btnStateActive.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
+        btnStateActive.setFocusPainted(false);
+        btnStateActive.setFocusable(false);
+        btnStateActive.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+        btnStateActive.setMaximumSize(new java.awt.Dimension(27, 27));
+        btnStateActive.setMinimumSize(new java.awt.Dimension(27, 27));
+        btnStateActive.setPreferredSize(new java.awt.Dimension(23, 23));
+        btnStateActive.setRequestFocusEnabled(false);
+        btnStateActive.setRolloverEnabled(false);
+        btnStateActive.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/state_active.png"))); // NOI18N
+        btnStateActive.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+        btnStateActive.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
-                cbStatusFilterActionPerformed(evt);
+                btnStateActiveActionPerformed(evt);
+            }
+        });
+        filterStateBar.add(btnStateActive);
+
+        btnStateFinished.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/state_finished.png"))); // NOI18N
+        btnStateFinished.setSelected(true);
+        btnStateFinished.setToolTipText("<HTML>Toggles the visibility of the table of completed <br>matches and tournaments in the lower area.\n<br>Showing the last 50 finished matches.");
+        btnStateFinished.setActionCommand("stateFinished");
+        btnStateFinished.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
+        btnStateFinished.setFocusPainted(false);
+        btnStateFinished.setFocusable(false);
+        btnStateFinished.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+        btnStateFinished.setMaximumSize(new java.awt.Dimension(27, 27));
+        btnStateFinished.setMinimumSize(new java.awt.Dimension(27, 27));
+        btnStateFinished.setPreferredSize(new java.awt.Dimension(23, 23));
+        btnStateFinished.setRequestFocusEnabled(false);
+        btnStateFinished.setRolloverEnabled(false);
+        btnStateFinished.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/state_finished.png"))); // NOI18N
+        btnStateFinished.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+        btnStateFinished.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                btnStateFinishedActionPerformed(evt);
+            }
+        });
+        filterStateBar.add(btnStateFinished);
+
+        filterTypeBar.setFloatable(false);
+        filterTypeBar.setFocusable(false);
+
+        btnTypeMatch.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/type_match.png"))); // NOI18N
+        btnTypeMatch.setSelected(true);
+        btnTypeMatch.setActionCommand("typeMatch");
+        btnTypeMatch.setFocusable(false);
+        btnTypeMatch.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+        btnTypeMatch.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+        filterTypeBar.add(btnTypeMatch);
+
+        btnTypeTourneyConstructed.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/type_tourney_construced.png"))); // NOI18N
+        btnTypeTourneyConstructed.setSelected(true);
+        btnTypeTourneyConstructed.setActionCommand("typeTourneyConstructed");
+        btnTypeTourneyConstructed.setFocusable(false);
+        btnTypeTourneyConstructed.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+        btnTypeTourneyConstructed.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+        filterTypeBar.add(btnTypeTourneyConstructed);
+
+        btnTypeTourneyLimited.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/type_tourney_limited.png"))); // NOI18N
+        btnTypeTourneyLimited.setSelected(true);
+        btnTypeTourneyLimited.setActionCommand("typeTourneyLimited");
+        btnTypeTourneyLimited.setFocusable(false);
+        btnTypeTourneyLimited.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+        btnTypeTourneyLimited.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+        filterTypeBar.add(btnTypeTourneyLimited);
+
+        filterFormatBar1.setFloatable(false);
+        filterFormatBar1.setFocusable(false);
+
+        btnFormatBlock.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/format_block.png"))); // NOI18N
+        btnFormatBlock.setSelected(true);
+        btnFormatBlock.setFocusable(false);
+        btnFormatBlock.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+        btnFormatBlock.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+        filterFormatBar1.add(btnFormatBlock);
+
+        btnFormatStandard.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/format_standard.png"))); // NOI18N
+        btnFormatStandard.setSelected(true);
+        btnFormatStandard.setFocusable(false);
+        btnFormatStandard.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+        btnFormatStandard.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+        filterFormatBar1.add(btnFormatStandard);
+
+        btnFormatModern.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/format_modern.png"))); // NOI18N
+        btnFormatModern.setSelected(true);
+        filterFormatBar1.add(btnFormatModern);
+
+        btnFormatCommander.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/format_commander.png"))); // NOI18N
+        btnFormatCommander.setSelected(true);
+        btnFormatCommander.setFocusable(false);
+        btnFormatCommander.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+        btnFormatCommander.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+        filterFormatBar1.add(btnFormatCommander);
+
+        filterFormatBar2.setFloatable(false);
+        filterFormatBar2.setToolTipText("All tables with active matches");
+        filterFormatBar2.setFocusable(false);
+
+        btnFormatLegacy.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/format_legacy.png"))); // NOI18N
+        btnFormatLegacy.setSelected(true);
+        btnFormatLegacy.setFocusable(false);
+        btnFormatLegacy.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+        btnFormatLegacy.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+        filterFormatBar2.add(btnFormatLegacy);
+
+        btnFormatVintage.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/format_vintage.png"))); // NOI18N
+        btnFormatVintage.setSelected(true);
+        btnFormatVintage.setFocusable(false);
+        btnFormatVintage.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+        btnFormatVintage.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+        filterFormatBar2.add(btnFormatVintage);
+
+        btnFormatOther.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/format_other.png"))); // NOI18N
+        btnFormatOther.setSelected(true);
+        filterFormatBar2.add(btnFormatOther);
+
+        btnFormatTinyLeader.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/format_tiny_leader.png"))); // NOI18N
+        btnFormatTinyLeader.setSelected(true);
+        filterFormatBar2.add(btnFormatTinyLeader);
+
+        btnQuickStart.setText("Quick Start");
+        btnQuickStart.setFocusable(false);
+        btnQuickStart.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+        btnQuickStart.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+        btnQuickStart.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                btnQuickStartActionPerformed(evt);
             }
         });
 
@@ -530,24 +706,37 @@ public class TablesPanel extends javax.swing.JPanel {
                 .addGap(6, 6, 6)
                 .addComponent(btnNewTournament)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+                    .addComponent(filterStateBar, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(filterTypeBar, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+                    .addComponent(filterFormatBar2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(filterFormatBar1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(btnQuickStart)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(chkShowCompleted)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(cbStatusFilter, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
         jPanel1Layout.setVerticalGroup(
             jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(jPanel1Layout.createSequentialGroup()
                 .addContainerGap()
+                .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                         .addComponent(btnNewTable)
-                    .addComponent(btnQuickStart)
-                    .addComponent(btnNewTournament)
-                    .addComponent(chkShowCompleted)
-                    .addComponent(cbStatusFilter, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addContainerGap(16, Short.MAX_VALUE))
+                        .addComponent(btnNewTournament))
+                    .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+                        .addGroup(jPanel1Layout.createSequentialGroup()
+                            .addComponent(filterStateBar, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                            .addComponent(filterTypeBar, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        .addGroup(jPanel1Layout.createSequentialGroup()
+                            .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                                .addComponent(filterFormatBar1, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                .addComponent(btnQuickStart))
+                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                            .addComponent(filterFormatBar2, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE))))
+                .addContainerGap())
         );
 
         jPanel2.setBorder(javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.RAISED));
@@ -626,7 +815,7 @@ public class TablesPanel extends javax.swing.JPanel {
         );
         jPanel3Layout.setVerticalGroup(
             jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(jSplitPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 505, Short.MAX_VALUE)
+            .addComponent(jSplitPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 494, Short.MAX_VALUE)
         );
 
         jSplitPane1.setLeftComponent(jPanel3);
@@ -643,13 +832,13 @@ public class TablesPanel extends javax.swing.JPanel {
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(layout.createSequentialGroup()
-                .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addGap(0, 0, 0)
                 .addComponent(jSplitPane1)
                 .addGap(0, 0, 0)
                 .addComponent(jPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE))
             .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                .addGap(0, 584, Short.MAX_VALUE))
+                .addGap(0, 598, Short.MAX_VALUE))
         );
     }// </editor-fold>//GEN-END:initComponents
 
@@ -701,20 +890,24 @@ public class TablesPanel extends javax.swing.JPanel {
         }
     }//GEN-LAST:event_jButton1ActionPerformed
 
-private void chkShowCompletedActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_chkShowCompletedActionPerformed
-    if (this.chkShowCompleted.isSelected()) {
+    private void btnStateWaitingActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnStateWaitingActionPerformed
+        activeTablesFilter();
+    }//GEN-LAST:event_btnStateWaitingActionPerformed
+
+    private void btnStateActiveActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnStateActiveActionPerformed
+        activeTablesFilter();
+    }//GEN-LAST:event_btnStateActiveActionPerformed
+
+    private void btnStateFinishedActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnStateFinishedActionPerformed
+        if (this.btnStateFinished.isSelected()) {
             this.jSplitPane2.setDividerLocation(-1);
         }
         else {
             this.jSplitPane2.setDividerLocation(this.jPanel3.getHeight());
         }
-    PreferencesDialog.saveValue(PreferencesDialog.KEY_TABLES_SHOW_COMPLETED, (chkShowCompleted.isSelected()?"Yes":"No"));
+        PreferencesDialog.saveValue(PreferencesDialog.KEY_TABLES_SHOW_COMPLETED, (btnStateFinished.isSelected()?"Yes":"No"));
         this.startTasks();
-}//GEN-LAST:event_chkShowCompletedActionPerformed
-
-    private void cbStatusFilterActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cbStatusFilterActionPerformed
-        activeTablesFilter();
-    }//GEN-LAST:event_cbStatusFilterActionPerformed
+    }//GEN-LAST:event_btnStateFinishedActionPerformed
 
     private void handleError(Exception ex) {
         logger.fatal("Error loading deck: ", ex);
@@ -723,12 +916,28 @@ private void chkShowCompletedActionPerformed(java.awt.event.ActionEvent evt) {//
 
     
     // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JToggleButton btnFormatBlock;
+    private javax.swing.JToggleButton btnFormatCommander;
+    private javax.swing.JToggleButton btnFormatLegacy;
+    private javax.swing.JToggleButton btnFormatModern;
+    private javax.swing.JToggleButton btnFormatOther;
+    private javax.swing.JToggleButton btnFormatStandard;
+    private javax.swing.JToggleButton btnFormatTinyLeader;
+    private javax.swing.JToggleButton btnFormatVintage;
     private javax.swing.JButton btnNewTable;
     private javax.swing.JButton btnNewTournament;
     private javax.swing.JButton btnQuickStart;
-    private javax.swing.JComboBox cbStatusFilter;
+    private javax.swing.JToggleButton btnStateActive;
+    private javax.swing.JToggleButton btnStateFinished;
+    private javax.swing.JToggleButton btnStateWaiting;
+    private javax.swing.JToggleButton btnTypeMatch;
+    private javax.swing.JToggleButton btnTypeTourneyConstructed;
+    private javax.swing.JToggleButton btnTypeTourneyLimited;
     private mage.client.chat.ChatPanel chatPanel;
-    private javax.swing.JCheckBox chkShowCompleted;
+    private javax.swing.JToolBar filterFormatBar1;
+    private javax.swing.JToolBar filterFormatBar2;
+    private javax.swing.JToolBar filterStateBar;
+    private javax.swing.JToolBar filterTypeBar;
     private javax.swing.JButton jButton1;
     private javax.swing.JLabel jLabel1;
     private javax.swing.JLabel jLabel2;