diff --git a/erpnext/templates/includes/projects.css b/erpnext/templates/includes/projects.css
index eede4e2..99ec4c8 100644
--- a/erpnext/templates/includes/projects.css
+++ b/erpnext/templates/includes/projects.css
@@ -13,6 +13,18 @@
 	padding-bottom: 5px;
 }
 
+#project-search {
+	border: none;
+}
+
+.task-link {
+	font-weight: bold;
+}
+
+.task-link.seen {
+	font-weight: normal;
+}
+
 .row-header {
     font-size: 14px;
     font-weight: 500;
@@ -136,7 +148,7 @@
     color: #fff;
 }
 
-   
+
 .timeline-centered .timeline-entry .timeline-entry-inner .timeline-label {
     position: relative;
     background: #f5f5f6;
diff --git a/erpnext/templates/includes/projects/macros.html b/erpnext/templates/includes/projects/macros.html
index a4abc94..5b22583 100644
--- a/erpnext/templates/includes/projects/macros.html
+++ b/erpnext/templates/includes/projects/macros.html
@@ -1,2 +1,2 @@
-{% macro back_link(doc) %}&back-to=/projects?project={{ doc.name }}|{{ doc.project_name }}{% endmacro %}
+{% macro back_link(doc) %}&back-to=/projects?project={{ doc.name }}&back-to-title={{ doc.project_name }}{% endmacro %}
 
diff --git a/erpnext/templates/includes/projects/project_issues.html b/erpnext/templates/includes/projects/project_issues.html
index 5f9d26f..f8924f5 100644
--- a/erpnext/templates/includes/projects/project_issues.html
+++ b/erpnext/templates/includes/projects/project_issues.html
@@ -4,7 +4,7 @@
 		<div class='issue'>
 			<div class='row project-item'>
 				<div class='col-xs-9'>
-					<a class="no-decoration" href="/issues-view?name={{ issue.name}}{{ back_link(doc) }}">
+					<a class="no-decoration" href="/issues?name={{ issue.name}}{{ back_link(doc) }}">
 						<span class="indicator {{ "red" if issue.status=="Open" else "green" }}">
 							{% if issue.status == "Closed" %}
 							{{ issue.subject }} resolved {{ frappe.utils.pretty_date(issue.resolution_date) }}
diff --git a/erpnext/templates/includes/project_search_box.html b/erpnext/templates/includes/projects/project_search_box.html
similarity index 70%
rename from erpnext/templates/includes/project_search_box.html
rename to erpnext/templates/includes/projects/project_search_box.html
index 8788fcd..59ebaa4 100644
--- a/erpnext/templates/includes/project_search_box.html
+++ b/erpnext/templates/includes/projects/project_search_box.html
@@ -1,7 +1,8 @@
 <div class="project-search">
 	<input type="text" id="project-search"
-	placeholder="Search..."><span style="position:relative;
-	left:-19px;"> <a href="/projects?project={{doc.name}}" class="octicon octicon-x text-extra-muted" title="Clear" ></a> </span>
+	placeholder="Search...">
+		<span style="position:relative;
+		left:-19px;"> <a href="/projects?project={{doc.name}}" class="octicon octicon-x text-extra-muted" title="Clear" ></a> </span>
 </div>
 
 <script>
diff --git a/erpnext/templates/includes/projects/project_tasks.html b/erpnext/templates/includes/projects/project_tasks.html
index 78cd9b6..3db5a68 100644
--- a/erpnext/templates/includes/projects/project_tasks.html
+++ b/erpnext/templates/includes/projects/project_tasks.html
@@ -4,23 +4,20 @@
 	<div class='task'>
 		<div class='row project-item'>
 			<div class='col-xs-9'>
-				<a class="no-decoration" href="/tasks?name={{ task.name }}{{ back_link(doc) }}">
-					<span class="indicator {{ "orange" if task.status=="Open" else "green" }}">
-						{% if task.status == "Closed" %}
-						{{ task.subject }} completed on {{ task.closing_date }}
-						{% else %}
-						{{ task.subject }}
-						{% endif %}
-					</span>
-				</a>
-			</div>
-			<div class='col-xs-3'>
-				<div class='pull-right'>
-					{% if task.todo %} <span class="avatar avatar-small" title="{{ task.todo.owner }}"> <img src="{{ 				task.todo.user_image }}"></span>
+				{% if task.todo %}
+				<span class="avatar avatar-small" title="{{ task.todo.owner }}">
+					<img src="{{ task.todo.user_image }}">
+				</span>
+				{% else %}
+				<span class="avatar avatar-small avatar-empty"></span>
+				{% endif %}
+				<a class="no-decoration task-link {{ task.css_seen }}" href="/tasks?name={{ task.name }}{{ back_link(doc) }}">
+					{% if task.status == "Closed" %}
+					{{ task.subject }} completed on {{ task.closing_date }}
 					{% else %}
-					<span class="avatar avatar-small avatar-empty"></span>
+					{{ task.subject }}
 					{% endif %}
-				</div>
+				</a>
 			</div>
 		</div>
 	</div>