diff --git a/issues/libpit/0022bv3.rst b/issues/libpit/0022bs3.rst
similarity index 100%
rename from issues/libpit/0022bv3.rst
rename to issues/libpit/0022bs3.rst
diff --git a/issues/pit-swing/0010fn7.rst b/issues/pit-swing/0010fs7.rst
similarity index 100%
rename from issues/pit-swing/0010fn7.rst
rename to issues/pit-swing/0010fs7.rst
diff --git a/pit-swing/griffon-app/lifecycle/Initialize.groovy b/pit-swing/griffon-app/lifecycle/Initialize.groovy
index 3fbfa26..4d2b3fd 100644
--- a/pit-swing/griffon-app/lifecycle/Initialize.groovy
+++ b/pit-swing/griffon-app/lifecycle/Initialize.groovy
@@ -21,4 +21,4 @@ import groovy.swing.SwingBuilder
 import griffon.util.GriffonPlatformHelper
 
 GriffonPlatformHelper.tweakForNativePlatform(app)
-SwingBuilder.lookAndFeel('mac', 'nimbus', 'gtk', ['metal', [boldFonts: false]])
\ No newline at end of file
+SwingBuilder.lookAndFeel('gtk', 'mac', 'org.pushingpixels.substance.api.skin.SubstanceCremeCoffeeLookAndFeel', 'nimbus', ['metal', [boldFonts: false]])
diff --git a/pit-swing/griffon-app/views/com/jdbernard/pit/swing/PITView.groovy b/pit-swing/griffon-app/views/com/jdbernard/pit/swing/PITView.groovy
index ea9ca4f..f9935d2 100644
--- a/pit-swing/griffon-app/views/com/jdbernard/pit/swing/PITView.groovy
+++ b/pit-swing/griffon-app/views/com/jdbernard/pit/swing/PITView.groovy
@@ -254,8 +254,6 @@ frame = application(title:'Personal Issue Tracker',
                imageIcon('/icon16x16.png').image]
 ) {
 
-    borderLayout()
-
     // main menu
     menuBar() {
         menu("File") {
@@ -311,11 +309,54 @@ frame = application(title:'Personal Issue Tracker',
             }
 
         }
+
+        menu('Sort') {
+            sortMenuButtonGroup = buttonGroup()
+            checkBoxMenuItem('By ID', 
+                buttonGroup: sortMenuButtonGroup,
+                actionPerformed: {
+                    filter.issueSorter = { it.id }
+                    projectListModels.clear()
+                    displayProject(selectedProject)
+                })
+            checkBoxMenuItem('By Category',
+                buttonGroup: sortMenuButtonGroup,
+                actionPerformed: {
+                    filter.issueSorter = { it.category }
+                    projectListModels.clear()
+                    displayProject(selectedProject)
+                })
+            checkBoxMenuItem('By Status',
+                buttonGroup: sortMenuButtonGroup,
+                actionPerformed: {
+                    filter.issueSorter = { it.status }
+                    projectListModels.clear()
+                    displayProject(selectedProject)
+                })
+            checkBoxMenuItem('By Priority',
+                buttonGroup: sortMenuButtonGroup,
+                actionPerformed: {
+                    filter.issueSorter = { it.priority }
+                    projectListModels.clear()
+                    displayProject(selectedProject)
+                })
+            checkBoxMenuItem('By Title',
+                buttonGroup: sortMenuButtonGroup,
+                actionPerformed: {
+                    filter.issueSorter = { it.title }
+                    projectListModels.clear()
+                    displayProject(selectedProject)
+                })
+        }
     }
 
+    gridBagLayout()
+
     // main split view
     splitPane(orientation: JSplitPane.HORIZONTAL_SPLIT,
-        dividerLocation: 280) {
+        dividerLocation: 280,
+        constraints: gbc(fill: GBC.BOTH, insets: [10,10,10,10],
+            weightx: 2, weighty: 2)) {
 
         // left side (projects tree and buttons)
         panel(constraints: "left") {
@@ -422,7 +463,8 @@ frame = application(title:'Personal Issue Tracker',
 
                 wordWrapCheckBox = checkBox('Word wrap',
                     constraints: gbc(gridx: 0, gridy: 1, weightx: 2,
-                        anchor: GBC.WEST), selected: true)
+                        anchor: GBC.WEST),
+                    selected: true)
                 button('New Issue',
                     constraints: gbc(gridx: 1, gridy: 1, anchor: GBC.EAST),
                     icon: imageIcon("/add.png"), actionPerformed: newIssue)
diff --git a/pit-swing/lib/substance.jar b/pit-swing/lib/substance.jar
new file mode 100644
index 0000000..9282a92
Binary files /dev/null and b/pit-swing/lib/substance.jar differ
diff --git a/pit-swing/lib/trident.jar b/pit-swing/lib/trident.jar
new file mode 100644
index 0000000..8d41a06
Binary files /dev/null and b/pit-swing/lib/trident.jar differ
diff --git a/release/pit-swing-2.0.1.jar b/release/pit-swing-2.1.0.jar
similarity index 62%
rename from release/pit-swing-2.0.1.jar
rename to release/pit-swing-2.1.0.jar
index 58ce5ad..02c0516 100644
Binary files a/release/pit-swing-2.0.1.jar and b/release/pit-swing-2.1.0.jar differ