--- a/src/main/webapp/pages/home.jsp	Wed May 25 11:20:27 2016 +0200
+++ b/src/main/webapp/pages/home.jsp	Mon Jul 18 17:35:32 2016 +0200
@@ -298,18 +298,13 @@
 				sessionBean.getHomePage().reloadBranches();
 		%>
 
-		<%
-			if (sessionBean.getHomePage().getCompleteBranchList().isEmpty()) {
-		%>
-		<label class="subTitel">You have no task!</label>
-		<%
-			} else {
-	
-		%>
-
 		<form name="homeForm" method="post"
 			action="<%=sessionBean.getApplicationBean().getRootServer()%>/proxy.jsp">
 			<input name="bean" type="hidden" value="homeBean" />
+	
+			<% if (sessionBean.getHomePage().getCompleteBranchList().isEmpty()) { %>
+				<label class="subTitel">You have no task!</label>
+			<% } else { %>
 
 			<div class="subTitel">
 				Your Tasks <input type="image"
@@ -794,11 +789,9 @@
 
 						<!-- Add to Topic -->
 						<td style="max-width: 300px;">
-							<!-- existing topic --> <%
- 	if (branch.getSection().getTopicSectionRelation() != null
- 						&& !branch.getSection()
- 								.getTopicSectionRelation().isEmpty()) {
- %>
+							<!-- existing topic --> 
+							<% if (branch.getSection().getTopicSectionRelation() != null && !branch.getSection().getTopicSectionRelation().isEmpty()) { %>
+							
 							<lable>Already in topic: </lable>
 							<table style="width: 100%">
 								<%