diff --git a/node_modules/fin b/node_modules/fin
index 1b9e5f5..361a6ac 160000
--- a/node_modules/fin
+++ b/node_modules/fin
@@ -1 +1 @@
-Subproject commit 1b9e5f5acc241dff3cd8e28f1cf2390a842c9cdf
+Subproject commit 361a6ac7711ed60f3fadbd2eb2ca304bb5a342be
diff --git a/node_modules/ui.js b/node_modules/ui.js
index 668b595..8ff4e4b 160000
--- a/node_modules/ui.js
+++ b/node_modules/ui.js
@@ -1 +1 @@
-Subproject commit 668b595c4f63bb15eb88eeb5e664b6834a5e2d9b
+Subproject commit 8ff4e4b45e2d22c0859eeac3c264e1ffd50543a0
diff --git a/src/client/base/WorkScreen.js b/src/client/base/WorkScreen.js
index 9e0e862..65ec7eb 100644
--- a/src/client/base/WorkScreen.js
+++ b/src/client/base/WorkScreen.js
@@ -10,14 +10,15 @@ module.exports = new Class(UIComponent, function(supr) {
 	}
 
 	this.renderContent = function() {
-		gData.taskList
-			.on('push', bind(this, this._renderTask))
-			.on('remove', bind(this, this._removeTask))
-
 		DIV('WorkScreen',
 			this._header = this._renderHeader().render(this).style({ height:this._headerHeight }),
 			this._body = this._renderBody().render(this).style({ top:this._headerHeight + 4 })
 		).appendTo(this)
+
+		gData.taskList
+			.on('clear', bind(this, this._clearTasks))
+			.on('push', bind(this, this._renderTask))
+			.on('remove', bind(this, this._removeTask))
 	}
 	
 	this._renderHeader = function() {
@@ -32,6 +33,11 @@ module.exports = new Class(UIComponent, function(supr) {
 		)
 	}
 	
+	this._clearTasks = function() {
+		this._taskList.getElement().innerHTML = ''
+		this._nodes = {}
+	}
+	
 	this._renderTask = function(task) {
 		var node = this._nodes[task._oid] = DIV('task',
 			INPUT('done', { type:'checkbox', data:task.done }),