diff --git a/build.xml b/build.xml
index 8944013..a7a98bb 100644
--- a/build.xml
+++ b/build.xml
@@ -23,9 +23,13 @@
 
     <target name="pit-swing" depends="libpit">
         <copy file="${libpit.jar}" todir="pit-swing/lib"/>
-        <ant dir="pit-cli" target="package" inheritAll="false"/>
+        <ant dir="pit-swing" fork="true" target="package" inheritAll="false"/>
     </target>
 
     <target name="package" depends="libpit,pit-cli,pit-swing">
+        <mkdir dir="release/lib"/>
+        <copy file="pit-cli/release/pit-clii-${application.version}.jar" todir="release"/>
+        <copy file="pit-swing/dist/jar/pit-swing.jar" tofile="release/pit-swing-${application.version}.jar"/>
+        <copy file="libpit/release/pit-${application.version}.jar" todir="release/lib"/>
     </target>
 </project>
diff --git a/libpit/project.properties b/libpit/project.properties
index 3700c26..747113d 100644
--- a/libpit/project.properties
+++ b/libpit/project.properties
@@ -1,10 +1,10 @@
-#Wed Feb 24 08:39:48 CST 2010
+#Thu Feb 25 17:24:06 CST 2010
 build.dir=build
 src.dir=src
 lib.shared.dir=../shared-libs
 test.dir=test
-build.number=10
-expected.application.version=1.1.6
+build.number=1
+expected.application.version=1.1.8
 lib.dir=lib
 release.dir=release
 release.jar=pit-${application.version}.jar
diff --git a/libpit/release/pit-1.1.6.jar b/libpit/release/pit-1.1.6.jar
deleted file mode 100644
index 1bf42a3..0000000
Binary files a/libpit/release/pit-1.1.6.jar and /dev/null differ
diff --git a/libpit/release/pit-1.1.8.jar b/libpit/release/pit-1.1.8.jar
new file mode 100644
index 0000000..64405ac
Binary files /dev/null and b/libpit/release/pit-1.1.8.jar differ
diff --git a/libpit/src/com/jdbernard/pit/FileProject.groovy b/libpit/src/com/jdbernard/pit/FileProject.groovy
index f008c7c..fcfb8d6 100644
--- a/libpit/src/com/jdbernard/pit/FileProject.groovy
+++ b/libpit/src/com/jdbernard/pit/FileProject.groovy
@@ -54,8 +54,6 @@ class FileProject extends Project {
         def issueFile = new File(source, FileIssue.makeFilename(id,
             options.category, options.priority))
 
-        assert !issueFile.exists()
-
         issueFile.createNewFile()
         issueFile.write(options.text)
 
diff --git a/pit-cli/lib/pit-1.1.4.jar b/pit-cli/lib/pit-1.1.4.jar
deleted file mode 100644
index 8dc6a2a..0000000
Binary files a/pit-cli/lib/pit-1.1.4.jar and /dev/null differ
diff --git a/pit-cli/lib/pit-1.1.6.jar b/pit-cli/lib/pit-1.1.6.jar
deleted file mode 100644
index 1bf42a3..0000000
Binary files a/pit-cli/lib/pit-1.1.6.jar and /dev/null differ
diff --git a/pit-cli/lib/pit-1.1.8.jar b/pit-cli/lib/pit-1.1.8.jar
new file mode 100644
index 0000000..64405ac
Binary files /dev/null and b/pit-cli/lib/pit-1.1.8.jar differ
diff --git a/pit-cli/project.properties b/pit-cli/project.properties
index c1e693e..6e22213 100644
--- a/pit-cli/project.properties
+++ b/pit-cli/project.properties
@@ -1,9 +1,9 @@
-#Wed Feb 24 08:40:12 CST 2010
+#Thu Feb 25 17:41:36 CST 2010
 build.dir=build
 src.dir=src
 build.jar=pit-cli-${application.version}.${build.number}.jar
 build.number=1
-expected.application.version=1.1.6
+expected.application.version=1.1.8
 lib.dir=lib
 release.dir=release
 release.jar=pit-cli-${application.version}.jar
diff --git a/pit-cli/release/pit-cli-1.1.6.jar b/pit-cli/release/pit-cli-1.1.8.jar
similarity index 95%
rename from pit-cli/release/pit-cli-1.1.6.jar
rename to pit-cli/release/pit-cli-1.1.8.jar
index 83a2db6..51bcf97 100644
Binary files a/pit-cli/release/pit-cli-1.1.6.jar and b/pit-cli/release/pit-cli-1.1.8.jar differ
diff --git a/pit-swing/application.properties b/pit-swing/application.properties
index 5f8ab17..787e9fa 100644
--- a/pit-swing/application.properties
+++ b/pit-swing/application.properties
@@ -1,4 +1,4 @@
 #Sat Feb 13 08:41:16 CST 2010
-app.version=1.1.6
+app.version=1.1.8
 app.griffon.version=0.2.1
 app.name=pit-swing
diff --git a/pit-swing/griffon-app/resources/icon16x16.png b/pit-swing/griffon-app/resources/icon16x16.png
new file mode 100644
index 0000000..01a8bd5
Binary files /dev/null and b/pit-swing/griffon-app/resources/icon16x16.png differ
diff --git a/pit-swing/griffon-app/resources/icon32x32.png b/pit-swing/griffon-app/resources/icon32x32.png
new file mode 100644
index 0000000..19171d2
Binary files /dev/null and b/pit-swing/griffon-app/resources/icon32x32.png differ
diff --git a/pit-swing/griffon-app/resources/icon64x64.png b/pit-swing/griffon-app/resources/icon64x64.png
new file mode 100644
index 0000000..0ee0fdb
Binary files /dev/null and b/pit-swing/griffon-app/resources/icon64x64.png differ
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 a4bf1c9..8ef6015 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
@@ -37,6 +37,7 @@ categoryIcons = [:]
 filter = new Filter(categories: [])
 
 popupProject = null
+selectedProject = model.rootProject
 
 popupIssue = null
 
@@ -125,14 +126,12 @@ newIssueDialog = dialog(title: 'New Task...', modal: true, pack: true,//size: [3
         constraints: gbc(gridx: 1, gridy: 4, insets: [5, 5, 5, 5],
             anchor: GBC.WEST),
         actionPerformed: {
-            def project = projectTree.leadSelectionPath
-                .lastPathComponent.userObject
-            def issue = project.createNewIssue(
+            def issue = selectedProject.createNewIssue(
                 category: categoryComboBox.selectedItem,
                 priority: prioritySpinner.value,
                 text: titleTextField.text)
-            projectListModels[(project.name)] = null
-            displayProject(project)
+            projectListModels[(selectedProject.name)] = null
+            displayProject(selectedProject)
             newIssueDialog.visible = false
         })
 }
@@ -166,8 +165,9 @@ issuePopupMenu = popupMenu() {
     menuItem('Delete Issue',
         actionPerformed: {
             if (!popupIssue) return
+            selectedProject.issues.remove(popupIssue.id)
+            projectListModels[(selectedProject.name)].removeElement(popupIssue)
             popupIssue.delete()
-
         })
 
     separator()
@@ -207,10 +207,10 @@ frame = application(title:'Personal Issue Tracker',
   //size:[320,480],
   pack:true,
   //location:[50,50],
-  iconImage: imageIcon('/griffon-icon-48x48.png').image,
-  iconImages: [imageIcon('/griffon-icon-48x48.png').image,
-               imageIcon('/griffon-icon-32x32.png').image,
-               imageIcon('/griffon-icon-16x16.png').image]
+  iconImage: imageIcon('/icon64x64.png').image,
+  iconImages: [imageIcon('/icon64x64.png').image,
+               imageIcon('/icon32x32.png').image,
+               imageIcon('/icon16x16.png').image]
 ) {
 
     borderLayout()
@@ -244,8 +244,7 @@ frame = application(title:'Personal Issue Tracker',
                             evt.source.selected = true
                         }
                         projectListModels.clear()
-                        displayProject(projectTree.leadSelectionPath
-                            ?.lastPathComponent?.userObject)
+                        displayProject(selectedProject)
                     })
             }
 
@@ -270,8 +269,8 @@ frame = application(title:'Personal Issue Tracker',
                         } else new DefaultTreeModel()
                     }),
                 valueChanged: { evt ->
-                    displayProject(evt?.newLeadSelectionPath
-                        ?.lastPathComponent?.userObject)
+                    selectedProject = evt?.newLeadSelectionPath?.lastPathComponent?.userObject ?: model.rootProject
+                    displayProject(selectedProject)
                 },
                 mouseClicked: { evt ->
                     if (evt.button == MouseEvent.BUTTON3) {
diff --git a/pit-swing/lib/pit-1.1.6.4.jar b/pit-swing/lib/pit-1.1.6.4.jar
deleted file mode 100644
index 394656c..0000000
Binary files a/pit-swing/lib/pit-1.1.6.4.jar and /dev/null differ
diff --git a/pit-swing/lib/pit-1.1.8.jar b/pit-swing/lib/pit-1.1.8.jar
new file mode 100644
index 0000000..64405ac
Binary files /dev/null and b/pit-swing/lib/pit-1.1.8.jar differ
diff --git a/version.properties b/version.properties
index 6a4f13a..16e803b 100644
--- a/version.properties
+++ b/version.properties
@@ -1 +1 @@
-application.version=1.1.6
+application.version=1.1.8