diff --git a/utilities/page/todo/todo.css b/utilities/page/todo/todo.css
index 088f60e199..f67f729c4f 100644
--- a/utilities/page/todo/todo.css
+++ b/utilities/page/todo/todo.css
@@ -3,13 +3,23 @@
 	clear: both;
 }
 
+.todoitem div {
+	float: left;
+	display: inline-block;
+	padding: 3px;
+}
+
 .todoitem .label {
 	width: 50px;
-	display: inline-block;
-	text-align: center;
 	margin-right: 11px;
 	margin-top: 3px;
-	float: left;
+	text-align: center;
+}
+
+.todoitem .todo-date {
+	margin-top: -2px;
+	margin-right: 7px;
+	color: #aaa;
 }
 
 .todoitem .close {
@@ -18,18 +28,9 @@
 }
 
 .todoitem .close-span {
-	display: inline-block;
 	float: right;
 }
 
-.todoitem .description {
-	padding: 3px 0px;
-}
-
-#todo-list {
-
-}
-
 .todo-separator {
 	border-bottom: 1px solid #DEB85F;
 	margin-bottom: 5px;
@@ -45,6 +46,6 @@
 	min-height: 300px;
 }
 
-.popup-on-click {
+.todoitem .popup-on-click {
 	margin: 0px 6px;
 }
\ No newline at end of file
diff --git a/utilities/page/todo/todo.js b/utilities/page/todo/todo.js
index 2032b31335..0617b4e292 100644
--- a/utilities/page/todo/todo.js
+++ b/utilities/page/todo/todo.js
@@ -80,17 +80,20 @@ erpnext.todo.ToDoItem = Class.extend({
 			todo.link = '';
 		}
 		if(!todo.description) todo.description = '';
+		todo.description_display = todo.description.replace(/\n\n/g, "<br>").trim();
 				
 		$(parent_list).append(repl('\
 			<div class="todoitem">\
-				<span class="label %(labelclass)s">%(priority)s</span>\
-				<span class="popup-on-click"><a href="#">[edit]</a></span>\
-				<span class="description">\
-					<span class="help" style="margin-right: 7px">%(userdate)s</span>\
-					%(fullname)s: %(description)s\
+				<div class="label %(labelclass)s">%(priority)s</div>\
+				<div class="popup-on-click"><a href="#">[edit]</a></div>\
+				<div class="todo-date-fullname">\
+					<div class="todo-date">%(userdate)s</div>\
+					%(fullname)s:\
+				</div>\
+				<div class="description">%(description_display)s\
 					<span class="ref_link">%(link)s</span>\
-				</span>\
-				<span class="close-span"><a href="#" class="close">&times;</a></span>\
+				</div>\
+				<div class="close-span"><a href="#" class="close">&times;</a></div>\
 			</div>\
 			<div class="todo-separator"></div>', todo));
 		$todo = $(parent_list + ' div.todoitem:last');