diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/ReleaseSummary.java b/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/ReleaseSummary.java
index 7585be119..7e4d4f7a3 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/ReleaseSummary.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/ReleaseSummary.java
@@ -101,6 +101,8 @@ private void setShortSummaryFields(Release document, Release copy) {
         copyField(document, copy, _Fields.COMPONENT_ID);
         copyField(document, copy, _Fields.CLEARING_TEAM_TO_FOSSOLOGY_STATUS);
         copyField(document, copy, _Fields.FOSSOLOGY_ID);
+        copyField(document, copy, _Fields.CLEARING_STATE);
+        copyField(document, copy, _Fields.MAINLINE_STATE);
     }
 
     private void setAdditionalFieldsForSummariesOtherThanShortAndDetailedExport(Release document, Release copy){
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ProjectRepository.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ProjectRepository.java
index a06108fd9..ae357a079 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ProjectRepository.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ProjectRepository.java
@@ -250,7 +250,7 @@ public Set<Project> getAccessibleProjects(User user) {
     }
 
     public List<Project> searchByName(String name, User user) {
-        return searchByName(name, user, SummaryType.SHORT);
+        return searchByName(name, user, SummaryType.SUMMARY);
     }
 
     @NotNull
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/PortalConstants.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/PortalConstants.java
index 86a197e4c..d654acc9e 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/PortalConstants.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/PortalConstants.java
@@ -213,6 +213,14 @@ public class PortalConstants {
     public static final String WHERE_ARRAY = "where[]";
     public static final String HOW = "how";
 
+    //! Specialized keys for CSS-classes of project (clearing) state boxes
+    public static final String PROJECT_STATE_ACTIVE__CSS      = "projectStateActive";
+    public static final String PROJECT_STATE_INACTIVE__CSS    = "projectStateInactive";
+    public static final String CLEARING_STATE_OPEN__CSS       = "clearingStateOpen";
+    public static final String CLEARING_STATE_INPROGRESS__CSS = "clearingStateInProgress";
+    public static final String CLEARING_STATE_CLOSED__CSS     = "clearingStateClosed";
+    public static final String CLEARING_STATE_UNKNOWN__CSS    = "clearingStateUnknown";
+
     //! Serve resource keywords
 
     //! Actions
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/components/ComponentPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/components/ComponentPortlet.java
index 873226aad..e39e52bfc 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/components/ComponentPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/components/ComponentPortlet.java
@@ -250,17 +250,12 @@ private void serveUnsubscribeRelease(ResourceRequest request, ResourceResponse r
     private void serveLinkedReleases(ResourceRequest request, ResourceResponse response) throws IOException, PortletException {
         String what = request.getParameter(PortalConstants.WHAT);
 
-        String projectId = request.getParameter(RELEASE_ID);
-
         if (PortalConstants.LIST_NEW_LINKED_RELEASES.equals(what)) {
             String[] where = request.getParameterValues(PortalConstants.WHERE_ARRAY);
             serveNewTableRowLinkedRelease(request, response, where);
         } else if (PortalConstants.RELEASE_SEARCH.equals(what)) {
             String where = request.getParameter(PortalConstants.WHERE);
             serveReleaseSearchResults(request, response, where);
-        } else if (PortalConstants.RELEASE_SEARCH_BY_VENDOR.equals(what)) {
-            String where = request.getParameter(PortalConstants.WHERE);
-            serveReleaseSearchResultsByVendor(request, response, where);
         }
     }
 
@@ -289,31 +284,26 @@ private void serveNewTableRowLinkedRelease(ResourceRequest request, ResourceResp
     }
 
     private void serveReleaseSearchResults(ResourceRequest request, ResourceResponse response, String searchText) throws IOException, PortletException {
-        serveReleaseSearch(request, response, searchText, false);
+        serveReleaseSearch(request, response, searchText);
     }
 
-    private void serveReleaseSearchResultsByVendor(ResourceRequest request, ResourceResponse response, String searchText) throws IOException, PortletException {
-        serveReleaseSearch(request, response, searchText, true);
-    }
-
-    private void serveReleaseSearch(ResourceRequest request, ResourceResponse response, String searchText, boolean searchByVendor) throws IOException, PortletException {
+    private void serveReleaseSearch(ResourceRequest request, ResourceResponse response, String searchText) throws IOException, PortletException {
         List<Release> searchResult;
 
         try {
             ComponentService.Iface componentClient = thriftClients.makeComponentClient();
-            if (searchByVendor) {
+
+            searchResult = componentClient.searchReleaseByNamePrefix(searchText);
+
+            if(searchText != "") {
                 final VendorService.Iface vendorClient = thriftClients.makeVendorClient();
                 final Set<String> vendorIds = vendorClient.searchVendorIds(searchText);
                 if (vendorIds != null && vendorIds.size() > 0) {
-                    searchResult = componentClient.getReleasesFromVendorIds(vendorIds);
-                } else {
-                    searchResult = Collections.emptyList();
+                    searchResult.addAll(componentClient.getReleasesFromVendorIds(vendorIds));
                 }
-            } else {
-                searchResult = componentClient.searchReleaseByNamePrefix(searchText);
             }
         } catch (TException e) {
-            log.error("Error searching projects", e);
+            log.error("Error searching linked releases", e);
             searchResult = Collections.emptyList();
         }
 
@@ -322,6 +312,7 @@ private void serveReleaseSearch(ResourceRequest request, ResourceResponse respon
         include("/html/utils/ajax/searchReleasesAjax.jsp", request, response, PortletRequest.RESOURCE_PHASE);
     }
 
+
     //! VIEW and helpers
     @Override
     public void doView(RenderRequest request, RenderResponse response) throws IOException, PortletException {
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/projects/ProjectPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/projects/ProjectPortlet.java
index f17c9bcbe..724bad420 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/projects/ProjectPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/projects/ProjectPortlet.java
@@ -354,9 +354,6 @@ private void serveLinkedReleases(ResourceRequest request, ResourceResponse respo
         } else if (PortalConstants.RELEASE_SEARCH.equals(what)) {
             String where = request.getParameter(PortalConstants.WHERE);
             serveReleaseSearchResults(request, response, where);
-        } else if (PortalConstants.RELEASE_SEARCH_BY_VENDOR.equals(what)) {
-            String where = request.getParameter(PortalConstants.WHERE);
-            serveReleaseSearchResultsByVendor(request, response, where);
         } else if (PortalConstants.RELEASE_LIST_FROM_LINKED_PROJECTS.equals(what)) {
             serveReleasesFromLinkedProjects(request, response, projectId);
         }
@@ -432,30 +429,30 @@ private void serveProjectSearchResults(ResourceRequest request, ResourceResponse
     }
 
     private void serveReleaseSearchResults(ResourceRequest request, ResourceResponse response, String searchText) throws IOException, PortletException {
-        serveReleaseSearch(request, response, searchText, false);
-    }
-
-    private void serveReleaseSearchResultsByVendor(ResourceRequest request, ResourceResponse response, String searchText) throws IOException, PortletException {
-        serveReleaseSearch(request, response, searchText, true);
+        serveReleaseSearch(request, response, searchText);
     }
 
-
     @SuppressWarnings("Duplicates")
-    private void serveReleaseSearch(ResourceRequest request, ResourceResponse response, String searchText, boolean searchByVendor) throws IOException, PortletException {
+    private void serveReleaseSearch(ResourceRequest request, ResourceResponse response, String searchText) throws IOException, PortletException {
         List<Release> searchResult;
 
         try {
+
             ComponentService.Iface componentClient = thriftClients.makeComponentClient();
-            if (searchByVendor) {
+
+            // First: Search by name:
+            searchResult = componentClient.searchReleaseByNamePrefix(searchText);
+
+            // If one is searching for everything, then it makes no sense to search also by vendors, as 'searchResult' already contains all releases.
+            if(searchText != "") {
+                // Second: Search by vendor and append:
+                //  Note: The search-by-vendor by definition does not give results if the search string is empty.
+                //        Therefore, an empty-string search does not introduce duplicated results, which is nice.
                 final VendorService.Iface vendorClient = thriftClients.makeVendorClient();
                 final Set<String> vendorIds = vendorClient.searchVendorIds(searchText);
                 if (vendorIds != null && vendorIds.size() > 0) {
-                    searchResult = componentClient.getReleasesFromVendorIds(vendorIds);
-                } else {
-                    searchResult = Collections.emptyList();
+                    searchResult.addAll(componentClient.getReleasesFromVendorIds(vendorIds));
                 }
-            } else {
-                searchResult = componentClient.searchReleaseByNamePrefix(searchText);
             }
         } catch (TException e) {
             log.error("Error searching projects", e);
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayProjectStateBox.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayProjectStateBox.java
index 8ada351a3..256487025 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayProjectStateBox.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayProjectStateBox.java
@@ -12,6 +12,7 @@
 import org.apache.thrift.TEnum;
 import org.eclipse.sw360.datahandler.common.ThriftEnumUtils;
 import org.eclipse.sw360.datahandler.thrift.projects.ProjectState;
+import org.eclipse.sw360.portal.common.PortalConstants;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.SimpleTagSupport;
@@ -26,9 +27,9 @@ public void setValue(ProjectState state) {
     }
 
     public String makeBox(ProjectState state) {
-        String projectStateBackgroundColour = "projectStateInactive";
+        String projectStateBackgroundColour = PortalConstants.PROJECT_STATE_INACTIVE__CSS;
         if( state == ProjectState.ACTIVE ) {
-            projectStateBackgroundColour = "projectStateActive";
+            projectStateBackgroundColour = PortalConstants.PROJECT_STATE_ACTIVE__CSS;
         }
         return "<div class=\"stateBox capsuleLeft capsuleRight " + projectStateBackgroundColour + "\" title=\"Project state: " + state + "\"> PS </div>";
     }
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayStateBoxes.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayStateBoxes.java
new file mode 100644
index 000000000..ca0ba757e
--- /dev/null
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayStateBoxes.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright Siemens AG, 2017.
+ * Part of the SW360 Portal Project.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.eclipse.sw360.portal.tags;
+
+import org.eclipse.sw360.datahandler.common.ThriftEnumUtils;
+import org.eclipse.sw360.datahandler.thrift.projects.Project;
+import org.eclipse.sw360.datahandler.thrift.projects.ProjectState;
+import org.eclipse.sw360.portal.common.PortalConstants;
+
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.JspTag;
+import javax.servlet.jsp.tagext.SimpleTagSupport;
+import java.io.IOException;
+
+import static org.eclipse.sw360.datahandler.thrift.projects.ProjectClearingState.*;
+
+public class DisplayStateBoxes extends SimpleTagSupport {
+
+    private Project project;
+
+    public void setProject(Project project) {
+        this.project = project;
+    }
+
+    public String makeBoxes() {
+        // The hardcoded strings correspond to CSS classes defined in sw360.css
+
+        // Add project state color to boxes if the project is active
+        //   (default color is grey)
+        String projectStateBackgroundColour = PortalConstants.PROJECT_STATE_INACTIVE__CSS;
+        if( project.isSetState() && project.state == ProjectState.ACTIVE ) { // -> green
+            projectStateBackgroundColour = PortalConstants.PROJECT_STATE_ACTIVE__CSS;
+        }
+
+        // Add clearingstate color to boxes in projects list
+        //   (default color is grey)
+        String clearingStateBackgroundColour = PortalConstants.CLEARING_STATE_UNKNOWN__CSS;
+
+        if(project.isSetClearingState()) {
+            switch(project.clearingState) {
+                case CLOSED: // -> green
+                    clearingStateBackgroundColour = PortalConstants.CLEARING_STATE_CLOSED__CSS;
+                    break;
+                case IN_PROGRESS: // -> yellow
+                    clearingStateBackgroundColour = PortalConstants.CLEARING_STATE_INPROGRESS__CSS;
+                    break;
+                case OPEN: // -> red
+                    clearingStateBackgroundColour = PortalConstants.CLEARING_STATE_OPEN__CSS;
+                    break;
+            }
+        }
+
+        String box_PS = "<div class=\"stateBox " + projectStateBackgroundColour + " capsuleLeft \" title=\"Project state: " + ThriftEnumUtils.enumToString(project.state) + "\"> PS </div>";
+        String box_CS = "<div class=\"stateBox capsuleRight " + clearingStateBackgroundColour + "\" title=\"Project clearing state: " + ThriftEnumUtils.enumToString(project.clearingState) + "\"> CS </div>";
+
+        return box_PS+box_CS;
+    }
+
+
+    public void doTag() throws JspException, IOException {
+        getJspContext().getOut().print( makeBoxes() );
+    }
+}
diff --git a/frontend/sw360-portlet/src/main/webapp/WEB-INF/customTags.tld b/frontend/sw360-portlet/src/main/webapp/WEB-INF/customTags.tld
index 109c25685..4f7f40da9 100644
--- a/frontend/sw360-portlet/src/main/webapp/WEB-INF/customTags.tld
+++ b/frontend/sw360-portlet/src/main/webapp/WEB-INF/customTags.tld
@@ -120,6 +120,17 @@
             <rtexprvalue>true</rtexprvalue>
         </attribute>
     </tag>
+    <tag>
+        <name>DisplayStateBoxes</name>
+        <tag-class>org.eclipse.sw360.portal.tags.DisplayStateBoxes</tag-class>
+        <body-content>empty</body-content>
+        <attribute>
+            <name>project</name>
+            <required>true</required>
+            <type>org.eclipse.sw360.datahandler.thrift.projects.Project</type>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
     <tag>
         <name>DisplayProjectStateBox</name>
         <tag-class>org.eclipse.sw360.portal.tags.DisplayProjectStateBox</tag-class>
diff --git a/frontend/sw360-portlet/src/main/webapp/html/components/editRelease.jsp b/frontend/sw360-portlet/src/main/webapp/html/components/editRelease.jsp
index 57d7421e9..e75adc53a 100644
--- a/frontend/sw360-portlet/src/main/webapp/html/components/editRelease.jsp
+++ b/frontend/sw360-portlet/src/main/webapp/html/components/editRelease.jsp
@@ -117,7 +117,7 @@
                         </div>
                         <core_rt:if test="${not addMode}">
                             <div id="tab-ReleaseClearingInformation">
-                                <%@include file="/html/components/includes/releases/editReleaseClearingInformation.jspf" %>
+                               <%@include file="/html/components/includes/releases/editReleaseClearingInformation.jspf" %>
                             </div>
                             <div id="tab-ReleaseECCInformation">
                                 <%@include file="/html/components/includes/releases/editReleaseECCInformation.jspf" %>
@@ -149,13 +149,13 @@
     <jsp:include page="/html/utils/includes/searchAndSelect.jsp" />
     <jsp:include page="/html/utils/includes/searchUsers.jsp" />
     <jsp:include page="/html/utils/includes/searchLicenses.jsp" />
-    <jsp:include page="/html/utils/includes/searchReleasesFromRelease.jsp" />
+    <%@ include file="/html/utils/includes/requirejs.jspf" %>
+    <core_rt:set var="enableSearchForReleasesFromLinkedProjects" value="${false}" scope="request"/>
+    <jsp:include page="/html/utils/includes/searchReleases.jsp" />
 </core_rt:if>
 
 <%@include file="/html/components/includes/vendors/searchVendor.jspf" %>
 
-<%--for javascript library loading --%>
-<%@ include file="/html/utils/includes/requirejs.jspf" %>
 <script>
     var tabView;
     var Y = YUI().use(
diff --git a/frontend/sw360-portlet/src/main/webapp/html/projects/ajax/searchProjectsAjax.jsp b/frontend/sw360-portlet/src/main/webapp/html/projects/ajax/searchProjectsAjax.jsp
index 9e859d7d8..c696b7414 100644
--- a/frontend/sw360-portlet/src/main/webapp/html/projects/ajax/searchProjectsAjax.jsp
+++ b/frontend/sw360-portlet/src/main/webapp/html/projects/ajax/searchProjectsAjax.jsp
@@ -21,13 +21,15 @@
         <tr>
             <td><input type="checkbox" name="<portlet:namespace/>projectId" value="${entry.id}"></td>
             <td><sw360:ProjectName project="${entry}"/></td>
+            <td><sw360:out value="${entry.version}"/></td>
+            <td><sw360:DisplayStateBoxes project="${entry}"/></td>
             <td><sw360:DisplayUserEmail email="${entry.projectResponsible}" bare="true"/></td>
             <td><sw360:out value="${entry.description}"/></td>
         </tr>
     </core_rt:forEach>
 </core_rt:if>
 <core_rt:if test="${projectSearch.size() == 0}">
-    <tr><td colspan="3">
+    <tr><td colspan="6">
         No project found with your search.
     </td></tr>
 
diff --git a/frontend/sw360-portlet/src/main/webapp/html/projects/edit.jsp b/frontend/sw360-portlet/src/main/webapp/html/projects/edit.jsp
index b4e11c4ec..517468036 100644
--- a/frontend/sw360-portlet/src/main/webapp/html/projects/edit.jsp
+++ b/frontend/sw360-portlet/src/main/webapp/html/projects/edit.jsp
@@ -87,6 +87,7 @@
         <form  id="projectEditForm" name="projectEditForm" action="<%=updateURL%>" method="post" >
             <%@include file="/html/projects/includes/projects/basicInfo.jspf" %>
             <%@include file="/html/projects/includes/linkedProjectsEdit.jspf" %>
+            <%@ include file="/html/utils/includes/requirejs.jspf" %>
             <%@include file="/html/utils/includes/linkedReleasesEdit.jspf" %>
             <core_rt:if test="${not addMode}" >
                 <%@include file="/html/utils/includes/editAttachments.jsp" %>
@@ -96,6 +97,7 @@
             </core_rt:if>
         </form>
         <jsp:include page="/html/projects/includes/searchProjects.jsp" />
+        <core_rt:set var="enableSearchForReleasesFromLinkedProjects" value="${true}" scope="request"/>
         <jsp:include page="/html/utils/includes/searchReleases.jsp" />
         <jsp:include page="/html/utils/includes/searchAndSelect.jsp" />
         <jsp:include page="/html/utils/includes/searchUsers.jsp" />
diff --git a/frontend/sw360-portlet/src/main/webapp/html/projects/includes/linkedProjectDelete.jspf b/frontend/sw360-portlet/src/main/webapp/html/projects/includes/linkedProjectDelete.jspf
index 83753b542..a0325982d 100644
--- a/frontend/sw360-portlet/src/main/webapp/html/projects/includes/linkedProjectDelete.jspf
+++ b/frontend/sw360-portlet/src/main/webapp/html/projects/includes/linkedProjectDelete.jspf
@@ -8,8 +8,6 @@
   ~ which accompanies this distribution, and is available at
   ~ http://www.eclipse.org/legal/epl-v10.html
 --%>
-<link rel="stylesheet" href="<%=request.getContextPath()%>/webjars/github-com-craftpip-jquery-confirm/3.0.1/jquery-confirm.min.css">
-<script src="<%=request.getContextPath()%>/webjars/github-com-craftpip-jquery-confirm/3.0.1/jquery-confirm.min.js" type="text/javascript"></script>
 <script>
     function deleteProjectLink(rowId) {
 
diff --git a/frontend/sw360-portlet/src/main/webapp/html/projects/includes/linkedProjectsEdit.jspf b/frontend/sw360-portlet/src/main/webapp/html/projects/includes/linkedProjectsEdit.jspf
index b0ad16ec2..cff09743e 100644
--- a/frontend/sw360-portlet/src/main/webapp/html/projects/includes/linkedProjectsEdit.jspf
+++ b/frontend/sw360-portlet/src/main/webapp/html/projects/includes/linkedProjectsEdit.jspf
@@ -20,6 +20,6 @@
     </tbody>
 </table>
 
-<input type="button" class="addButton" onclick="showProjectDialog();" value="Click to add linked Projects"  >
+<input type="button" class="addButton" id="addLinkedProjectButton" value="Click to add linked Projects"  >
 <br/>
 <br/>
diff --git a/frontend/sw360-portlet/src/main/webapp/html/projects/includes/searchProjects.jsp b/frontend/sw360-portlet/src/main/webapp/html/projects/includes/searchProjects.jsp
index b1d37cdfc..313f22324 100644
--- a/frontend/sw360-portlet/src/main/webapp/html/projects/includes/searchProjects.jsp
+++ b/frontend/sw360-portlet/src/main/webapp/html/projects/includes/searchProjects.jsp
@@ -22,34 +22,33 @@
     <form>
         <div style="display: inline-block">
             <input type="text" name="searchproject" id="searchproject" placeholder="search" class="searchbar"/>&nbsp;
-            <input type="button" value="Search"
-                   onclick="ProjectContentFromAjax('projectSearchResultstable', '<%=PortalConstants.PROJECT_SEARCH%>', $('#searchproject').val(), true);"
-                   class="searchbutton" id="searchbuttonproject"/>
+            <input type="button" value="Search" class="searchbutton" id="searchbuttonproject"/>
+            <span style="display: none; color: red" id="loadingProjectsTableNotifier" >Loading table...</span>
         </div>
 
         <div id="Projectsearchresults">
-            <table width="100%" style="border-bottom: 2px solid #66c1c2;">
-                <thead>
+            <table width="100%" id="projectSearchResultstable">
+                <thead style="border-bottom: 2px solid #66c1c2;" >
                 <tr class="trheader" style="height: 30px;">
                     <th width="4%">&nbsp;</th>
-                    <th width="32%" class="textlabel">Project name</th>
-                    <th width="32%" class="textlabel">Project Responsible</th>
-                    <th width="32%" class="textlabel">Description</th>
+                    <th class="textlabel" align="left">Project name</th>
+                    <th class="textlabel" align="left">Version</th>
+                    <th class="textlabel" align="left">State</th>
+                    <th class="textlabel" align="left">Responsible</th>
+                    <th class="textlabel" align="left">Description</th>
                 </tr>
                 </thead>
-            </table>
-            <div style="overflow-y: scroll; height: 150px;">
-                <table id="projectSearchResultstable" width="100%">
+                <tbody>
                     <tr class="trbodyClass">
-                        <td colspan="4"></td>
+                        <td></td><td></td><td></td><td></td><td></td><td></td>
                     </tr>
-                </table>
-            </div>
+                </tbody>
+            </table>
             <hr noshade size="1" style="background-color: #66c1c2; border-color: #59D1C4;"/>
             <br/>
 
             <div>
-                <input type="button" value="Select" class="addButton" onclick="selectProject();"/>
+                <input type="button" value="Select" class="addButton" id="selectProjectButton"/>
             </div>
         </div>
     </form>
@@ -61,55 +60,102 @@
 </portlet:resourceURL>
 
 
-
-
 <script>
-    function showProjectDialog(){
-        openDialog('search-project-form', 'searchproject');
-    }
+    require(['jquery', /* jquery-plugins: */ 'datatables', 'jquery-ui', 'jquery-confirm'], function($) {
+
+        $('#addLinkedProjectButton').on('click', showProjectDialog);
+        $('#searchbuttonproject').on('click', function() { ProjectContentFromAjax('projectSearchResultstable', '<%=PortalConstants.PROJECT_SEARCH%>', $('#searchproject').val(), true); });
+        $('#selectProjectButton').on('click', selectProject);
+
+        var firstRunForProjectsTable = true;
+
+        function destroyProjectsDataTable() {
+            $('#projectSearchResultstable').DataTable().destroy();
+        }
+
+        function toggleProjectSearchNotification() {
+            $('#searchbuttonproject').prop('disabled', !$('#searchbuttonproject').prop('disabled'));
+            $('#loadingProjectsTableNotifier').toggle();
+        }
+
+        function makeProjectsDataTable() {
+            $('#projectSearchResultstable').DataTable(
+                {
+                    "sPaginationType": "full_numbers",
+                    "paging": false,
+                    "scrollY": "220",
+                    "info": false,
+                    "bFilter": false,
+                    "language": {"processing":     "Processing..."},
+                    "processing": true,
+                    "initComplete": toggleProjectSearchNotification
+                });
+        }
+
+        function showProjectDialog() {
+            openDialog('search-project-form', 'searchproject');
+            if (firstRunForProjectsTable) {
+                toggleProjectSearchNotification();
+                makeProjectsDataTable();
+                firstRunForProjectsTable = false;
+            }
+        }
 
-    function selectProject() {
+        function selectProject() {
 
-        var projectIds  = [];
+            var projectIds = [];
 
-        $('#projectSearchResultstable').find(':checked').each(
-                function() {
+            $('#projectSearchResultstable').find(':checked').each(
+                function () {
                     projectIds.push(this.value);
                 }
-        );
-        addProjectInfo(projectIds);
-
-        closeOpenDialogs();
-        return false;
-    }
-
-
-    function addProjectInfo(linkedProjects) {
-        ProjectContentFromAjax('LinkedProjectsInfo', '<%=PortalConstants.LIST_NEW_LINKED_PROJECTS%>', linkedProjects);
-    }
-
-    function ProjectContentFromAjax(id, what, where, replace) {
-        jQuery.ajax({
-            type: 'POST',
-            url: '<%=viewProjectURL%>',
-            data: {
-                '<portlet:namespace/><%=PortalConstants.WHAT%>': what,
-                '<portlet:namespace/><%=PortalConstants.WHERE%>': where
-            },
-            success: function (data) {
-                if (replace) {
-                    $('#' + id + " tbody").html(data);
-                } else {
-                    $('#' + id + " tbody").append(data);
-                }
+            );
+            addProjectInfo(projectIds);
+
+            closeOpenDialogs();
+            return false;
+        }
+
+
+        function addProjectInfo(linkedProjects) {
+            ProjectContentFromAjax('LinkedProjectsInfo', '<%=PortalConstants.LIST_NEW_LINKED_PROJECTS%>', linkedProjects);
+        }
+
+        function setDataToProjectsTableAndRefresh(id, data) {
+            if (data.indexOf("No project found") == -1) {
+                destroyProjectsDataTable();
+                $('#' + id + " tbody").html(data);
+                makeProjectsDataTable();
+            } else {
+                $('#' + id + " tbody").html(data);
+                toggleProjectSearchNotification();
             }
-        });
-    }
+        }
+
+        function ProjectContentFromAjax(id, what, where, replace) {
+            toggleProjectSearchNotification();
+            jQuery.ajax({
+                type: 'POST',
+                url: '<%=viewProjectURL%>',
+                data: {
+                    '<portlet:namespace/><%=PortalConstants.WHAT%>': what,
+                    '<portlet:namespace/><%=PortalConstants.WHERE%>': where
+                },
+                success: function (data) {
+                    if (replace) {
+                        setDataToProjectsTableAndRefresh(id, data);
+                    } else {
+                        $('#' + id + " tbody").append(data);
+                    }
+                }
+            });
+        }
 
-    $(document).ready(function () {
+        $(document).ready(function () {
                 bindkeyPressToClick('searchproject', 'searchbuttonproject');
             }
-    );
+        );
+    } );
 
 </script>
 
diff --git a/frontend/sw360-portlet/src/main/webapp/html/projects/view.jsp b/frontend/sw360-portlet/src/main/webapp/html/projects/view.jsp
index 245667aaf..d32eda3b3 100644
--- a/frontend/sw360-portlet/src/main/webapp/html/projects/view.jsp
+++ b/frontend/sw360-portlet/src/main/webapp/html/projects/view.jsp
@@ -275,7 +275,7 @@
 		            "id": '${project.id}',
 		            "name": '<sw360:ProjectName project="${project}"/>',
 		            "description": '<sw360:DisplayDescription description="${project.description}" maxChar="140" jsQuoting="'"/>',
-		            "state": ["<sw360:DisplayEnum value='${project.state}'/>", "<sw360:DisplayEnum value='${project.clearingState}'/>"],
+		            "state": '<sw360:DisplayStateBoxes project="${project}"/>',
 		            "clearing": 'Not loaded yet',
 		            "responsible": '<sw360:DisplayUserEmail email="${project.projectResponsible}" bare="true"/>',
 		            "linkedProjectsSize": '${project.linkedProjectsSize}',
@@ -293,7 +293,7 @@
 		                {title: "Project Name", data: "name", render: {display: renderProjectNameLink}},
 		                {title: "Description", data: "description"},
 		                {title: "Project Responsible", data: "responsible"},
-		                {title: "State", data: "state", render: {display: displayStateBoxes}},
+		                {title: "State", data: "state"},
 		                {title: "<span title=\"Release clearing state\">Clearing Status</span>", data: "clearing"},
 		                {title: "Actions", data: "id", render: {display: renderProjectActions}}
 		            ]
diff --git a/frontend/sw360-portlet/src/main/webapp/html/utils/ajax/searchReleasesAjax.jsp b/frontend/sw360-portlet/src/main/webapp/html/utils/ajax/searchReleasesAjax.jsp
index edcbea6dc..6e6f59586 100644
--- a/frontend/sw360-portlet/src/main/webapp/html/utils/ajax/searchReleasesAjax.jsp
+++ b/frontend/sw360-portlet/src/main/webapp/html/utils/ajax/searchReleasesAjax.jsp
@@ -25,11 +25,13 @@
             <td><sw360:out value="${entry.vendor.fullname}"/></td>
             <td><sw360:out value="${entry.name}"/></td>
             <td><sw360:out value="${entry.version}"/></td>
+            <td><sw360:DisplayEnum value="${entry.clearingState}"/></td>
+            <td><sw360:DisplayEnum value="${entry.mainlineState}"/></td>
         </tr>
     </core_rt:forEach>
 </core_rt:if>
 <core_rt:if test="${releaseSearch.size() == 0}">
-    <tr><td colspan="4">
+    <tr><td colspan="6">
         No releases found with your search.
     </td></tr>
 
diff --git a/frontend/sw360-portlet/src/main/webapp/html/utils/includes/editLinkedReleases.jspf b/frontend/sw360-portlet/src/main/webapp/html/utils/includes/editLinkedReleases.jspf
index e2455f471..58d0adb58 100644
--- a/frontend/sw360-portlet/src/main/webapp/html/utils/includes/editLinkedReleases.jspf
+++ b/frontend/sw360-portlet/src/main/webapp/html/utils/includes/editLinkedReleases.jspf
@@ -20,6 +20,6 @@
     </tbody>
 </table>
 
-<input type="button" class="addButton" onclick="showReleaseDialog();" value="Click to add Releases"  >
+<input type="button" class="addButton" id="addLinkedReleasesToReleaseButton" value="Click to add Releases"  >
 <br/>
 <br/>
diff --git a/frontend/sw360-portlet/src/main/webapp/html/utils/includes/linkedReleaseDelete.jspf b/frontend/sw360-portlet/src/main/webapp/html/utils/includes/linkedReleaseDelete.jspf
index d20eff14e..c86966b94 100644
--- a/frontend/sw360-portlet/src/main/webapp/html/utils/includes/linkedReleaseDelete.jspf
+++ b/frontend/sw360-portlet/src/main/webapp/html/utils/includes/linkedReleaseDelete.jspf
@@ -8,8 +8,6 @@
   ~ which accompanies this distribution, and is available at
   ~ http://www.eclipse.org/legal/epl-v10.html
 --%>
-<link rel="stylesheet" href="<%=request.getContextPath()%>/webjars/github-com-craftpip-jquery-confirm/3.0.1/jquery-confirm.min.css">
-<script src="<%=request.getContextPath()%>/webjars/github-com-craftpip-jquery-confirm/3.0.1/jquery-confirm.min.js" type="text/javascript"></script>
 <script>
     function deleteReleaseLink(rowId, longName) {
 
diff --git a/frontend/sw360-portlet/src/main/webapp/html/utils/includes/linkedReleasesEdit.jspf b/frontend/sw360-portlet/src/main/webapp/html/utils/includes/linkedReleasesEdit.jspf
index 1a561f0c2..d236109da 100644
--- a/frontend/sw360-portlet/src/main/webapp/html/utils/includes/linkedReleasesEdit.jspf
+++ b/frontend/sw360-portlet/src/main/webapp/html/utils/includes/linkedReleasesEdit.jspf
@@ -20,6 +20,6 @@
     </tbody>
 </table>
 
-<input type="button" class="addButton" onclick="showReleaseDialog();" value="Click to add Releases"  >
+<input type="button" class="addButton" id="addLinkedReleasesToReleaseButton" value="Click to add Releases"  >
 <br/>
 <br/>
diff --git a/frontend/sw360-portlet/src/main/webapp/html/utils/includes/searchReleases.jsp b/frontend/sw360-portlet/src/main/webapp/html/utils/includes/searchReleases.jsp
index 4cf94f1ad..9bd4b653b 100644
--- a/frontend/sw360-portlet/src/main/webapp/html/utils/includes/searchReleases.jsp
+++ b/frontend/sw360-portlet/src/main/webapp/html/utils/includes/searchReleases.jsp
@@ -23,40 +23,36 @@
     <form>
         <div style="display: inline-block">
             <input type="text" name="searchrelease" id="searchrelease" placeholder="search" class="searchbar"/>&nbsp;
-            <input type="button" value="Search by name"
-                   onclick="ReleaseContentFromAjax('releaseSearchResultsTable', '<%=PortalConstants.RELEASE_SEARCH%>', $('#searchrelease').val(), true);"
-                   class="searchbutton" id="searchbuttonrelease"/>
-            <input type="button" value="Search by vendor"
-                   onclick="ReleaseContentFromAjax('releaseSearchResultsTable', '<%=PortalConstants.RELEASE_SEARCH_BY_VENDOR%>', $('#searchrelease').val(), true);"
-                   class="searchbutton" id="searchbuttonrelease2"/>
-            <input type="button" value="Releases of linked projects"
-                   onclick="ReleaseContentFromAjax('releaseSearchResultsTable', '<%=PortalConstants.RELEASE_LIST_FROM_LINKED_PROJECTS%>', '', true);"
-                   class="searchbutton" />
+            <input type="button" value="Search" class="searchbutton" id="releaseSearchButton"/>
+            <core_rt:if test="${enableSearchForReleasesFromLinkedProjects}">
+                <input type="button" value="Releases of linked projects" class="searchbutton" id="linkedReleasesButton" />
+            </core_rt:if>
+            <span style="display: none; color: red" id="loadingReleasesTableNotifier" >Loading table...</span>
         </div>
 
         <div id="Releasesearchresults">
-            <table width="100%" style="border-bottom: 2px solid #66c1c2;">
-                <thead>
+            <table width="100%" id="releaseSearchResultsTable">
+                <thead style="border-bottom: 2px solid #66c1c2;" >
                 <tr class="trheader" style="height: 30px;">
                     <th width="4%">&nbsp;</th>
-                    <th width="32%" class="textlabel">Vendor</th>
-                    <th width="32%" class="textlabel">Release name</th>
-                    <th width="32%" class="textlabel">Version</th>
+                    <th width="19.2%" align="left">Vendor</th>
+                    <th width="19.2%" align="left">Release name</th>
+                    <th width="19.2%" align="left">Version</th>
+                    <th width="19.2%" align="left">Clearing state</th>
+                    <th width="19.2%" align="left">Mainline state</th>
                 </tr>
                 </thead>
-            </table>
-            <div style="overflow-y: scroll; height: 150px;">
-                <table id="releaseSearchResultsTable" width="100%">
+                <tbody>
                     <tr class="trbodyClass">
-                        <td colspan="4"></td>
+                        <td></td><td></td><td></td><td></td><td></td><td></td>
                     </tr>
-                </table>
-            </div>
+                </tbody>
+            </table>
             <hr noshade size="1" style="background-color: #66c1c2; border-color: #59D1C4;"/>
             <br/>
 
             <div>
-                <input type="button" value="Select" class="addButton" onclick="selectRelease();"/>
+                <input type="button" value="Select" class="addButton" id="selectReleaseButton"/>
             </div>
         </div>
     </form>
@@ -68,51 +64,108 @@
 </portlet:resourceURL>
 
 <script>
-    function showReleaseDialog() {
-        openDialog('search-release-form', 'searchrelease');
-    }
 
-    function selectRelease() {
-        var releaseIds = [];
+    require(['jquery', /* jquery-plugins: */ 'datatables', 'jquery-ui', 'jquery-confirm'], function($) {
+
+        $("#addLinkedReleasesToReleaseButton").on('click', showReleaseDialog);
+        $('#releaseSearchButton').on('click', function() { ReleaseContentFromAjax('releaseSearchResultsTable', '<%=PortalConstants.RELEASE_SEARCH%>', $('#searchrelease').val(), true); });
+        <core_rt:if test="${enableSearchForReleasesFromLinkedProjects}">
+            $('#linkedReleasesButton').on('click', function() { ReleaseContentFromAjax('releaseSearchResultsTable', '<%=PortalConstants.RELEASE_LIST_FROM_LINKED_PROJECTS%>', '', true); });
+        </core_rt:if>
+        $('#selectReleaseButton').on('click', selectRelease);
+
+
+        var firstRunForReleasesTable = true;
+
+        function destroyReleaseDataTable() {
+            $('#releaseSearchResultsTable').DataTable().destroy();
+        }
+
+        function toggleReleasesSearchNotification() {
+            $('#releaseSearchButton').prop('disabled', !$('#releaseSearchButton').prop('disabled'));
+            $('#linkedReleasesButton').prop('disabled', !$('#linkedReleasesButton').prop('disabled'));
+            $('#loadingReleasesTableNotifier').toggle();
+        }
+
+        function makeReleaseDataTable() {
+            $('#releaseSearchResultsTable').DataTable(
+                {
+                    "sPaginationType": "full_numbers",
+                    "paging": false,
+                    "scrollY": "220",
+                    "info": false,
+                    "bFilter": false,
+                    "language": {"processing":     "Processing..."},
+                    "processing": true,
+                    "initComplete": toggleReleasesSearchNotification
+                });
+        }
+
+        function showReleaseDialog() {
+            openDialog('search-release-form', 'searchrelease');
+            if (firstRunForReleasesTable) {
+                toggleReleasesSearchNotification();
+                makeReleaseDataTable();
+                firstRunForReleasesTable = false;
+            }
+        }
+
+        function selectRelease() {
+            var releaseIds = [];
 
-        $('#releaseSearchResultsTable').find(':checked').each(
-                function() {
+            $('#releaseSearchResultsTable').find(':checked').each(
+                function () {
                     releaseIds.push(this.value);
                 }
-        );
-        addReleaseInfo(releaseIds);
-
-        closeOpenDialogs();
-        return false;
-    }
-
-
-    function addReleaseInfo(linkedReleases) {
-        ReleaseContentFromAjax('LinkedReleasesInfo', '<%=PortalConstants.LIST_NEW_LINKED_RELEASES%>', linkedReleases);
-    }
-
-    function ReleaseContentFromAjax(id, what, where, replace) {
-        jQuery.ajax({
-            type: 'POST',
-            url: '<%=viewReleaseURL%>',
-            data: {
-                '<portlet:namespace/><%=PortalConstants.WHAT%>': what,
-                '<portlet:namespace/><%=PortalConstants.WHERE%>': where
-            },
-            success: function (data) {
-                if (replace) {
-                    $('#' + id + " tbody").html(data);
-                } else {
-                    $('#' + id + " tbody").append(data);
-                }
+            );
+            addReleaseInfo(releaseIds);
+
+            closeOpenDialogs();
+            return false;
+        }
+
+
+        function addReleaseInfo(linkedReleases) {
+            ReleaseContentFromAjax('LinkedReleasesInfo', '<%=PortalConstants.LIST_NEW_LINKED_RELEASES%>', linkedReleases);
+        }
+
+        function setDataToReleaseTableAndRefresh(id, data) {
+            if (data.indexOf("No releases found") == -1) {
+                destroyReleaseDataTable();
+                $('#' + id + " tbody").html(data);
+                makeReleaseDataTable();
+            } else {
+                $('#' + id + " tbody").html(data);
+                toggleReleasesSearchNotification();
             }
-        });
-    }
+        }
+
+        function ReleaseContentFromAjax(id, what, where, replace) {
+            toggleReleasesSearchNotification()
+            jQuery.ajax({
+                type: 'POST',
+                url: '<%=viewReleaseURL%>',
+                data: {
+                    '<portlet:namespace/><%=PortalConstants.WHAT%>': what,
+                    '<portlet:namespace/><%=PortalConstants.WHERE%>': where
+                },
+                success: function (data) {
+                    if (replace) {
+                        setDataToReleaseTableAndRefresh(id, data);
+                    } else {
+                        $('#' + id + " tbody").append(data);
+                    }
+                }
+            });
+        }
 
-    $(document).ready(function () {
+        $(document).ready(function () {
                 bindkeyPressToClick('searchrelease', 'searchbuttonrelease');
             }
-    );
+        );
+    } );
 </script>
 
-<%@include file="/html/utils/includes/linkedReleaseDelete.jspf" %>
\ No newline at end of file
+<%@include file="/html/utils/includes/linkedReleaseDelete.jspf" %>
+<link rel="stylesheet" href="<%=request.getContextPath()%>/css/dataTable_Siemens.css">
+<link rel="stylesheet" href="<%=request.getContextPath()%>/css/sw360.css">
\ No newline at end of file
diff --git a/frontend/sw360-portlet/src/main/webapp/html/utils/includes/searchReleasesFromRelease.jsp b/frontend/sw360-portlet/src/main/webapp/html/utils/includes/searchReleasesFromRelease.jsp
deleted file mode 100644
index 78ad6a7ae..000000000
--- a/frontend/sw360-portlet/src/main/webapp/html/utils/includes/searchReleasesFromRelease.jsp
+++ /dev/null
@@ -1,120 +0,0 @@
-<%--
-  ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
-  ~
-  ~ SPDX-License-Identifier: EPL-1.0
-  ~
-  ~ All rights reserved. This program and the accompanying materials
-  ~ are made available under the terms of the Eclipse Public License v1.0
-  ~ which accompanies this distribution, and is available at
-  ~ http://www.eclipse.org/legal/epl-v10.html
-  --%>
-
-<%@ page import="com.liferay.portlet.PortletURLFactoryUtil" %>
-<%@include file="/html/init.jsp" %>
-
-
-<%@ taglib prefix="sw360" uri="/WEB-INF/customTags.tld" %>
-<portlet:defineObjects/>
-<liferay-theme:defineObjects/>
-
-<%@ page import="org.eclipse.sw360.portal.common.PortalConstants" %>
-<jsp:useBean id="release" class="org.eclipse.sw360.datahandler.thrift.components.Release" scope="request" />
-<div id="search-release-form" title="Search Release" style="display: none; background-color: #ffffff;">
-    <form>
-        <div style="display: inline-block">
-            <input type="text" name="searchrelease" id="searchrelease" placeholder="search" class="searchbar"/>&nbsp;
-            <input type="button" value="Search by name"
-                   onclick="ReleaseContentFromAjax('releaseSearchResultsTable', '<%=PortalConstants.RELEASE_SEARCH%>', $('#searchrelease').val(), true);"
-                   class="searchbutton" id="searchbuttonrelease"/>
-            <input type="button" value="Search by vendor"
-                   onclick="ReleaseContentFromAjax('releaseSearchResultsTable', '<%=PortalConstants.RELEASE_SEARCH_BY_VENDOR%>', $('#searchrelease').val(), true);"
-                   class="searchbutton" id="searchbuttonrelease2"/>
-        </div>
-
-        <div id="Releasesearchresults">
-            <table width="100%" style="border-bottom: 2px solid #66c1c2;">
-                <thead>
-                <tr class="trheader" style="height: 30px;">
-                    <th width="4%">&nbsp;</th>
-                    <th width="32%" class="textlabel">Vendor</th>
-                    <th width="32%" class="textlabel">Release name</th>
-                    <th width="32%" class="textlabel">Version</th>
-                </tr>
-                </thead>
-            </table>
-            <div style="overflow-y: scroll; height: 150px;">
-                <table id="releaseSearchResultsTable" width="100%">
-                    <tr class="trbodyClass">
-                        <td colspan="4"></td>
-                    </tr>
-                </table>
-            </div>
-            <hr noshade size="1" style="background-color: #66c1c2; border-color: #59D1C4;"/>
-            <br/>
-
-            <div>
-                <input type="button" value="Select" class="addButton" onclick="selectRelease();"/>
-            </div>
-        </div>
-    </form>
-</div>
-
-<portlet:resourceURL var="viewReleaseURL">
-    <portlet:param name="<%=PortalConstants.ACTION%>" value="<%=PortalConstants.VIEW_LINKED_RELEASES%>"/>
-    <portlet:param name="<%=PortalConstants.RELEASE_ID%>" value="${release.id}"/>
-</portlet:resourceURL>
-
-<script>
-    function showReleaseDialog() {
-        openDialog('search-release-form', 'searchrelease');
-    }
-
-    function selectRelease() {
-        var releaseIds = [];
-
-        $('#releaseSearchResultsTable').find(':checked').each(
-            function() {
-                var currentRelease = "<sw360:out value="${release.id}"/>";
-                if (currentRelease !== this.value) {
-                    releaseIds.push(this.value);
-                } else {
-                    $.alert("Releases should not link to themselves.");
-                }
-            }
-        );
-        addReleaseInfo(releaseIds);
-
-        closeOpenDialogs();
-        return false;
-    }
-
-
-    function addReleaseInfo(linkedReleases) {
-        ReleaseContentFromAjax('LinkedReleasesInfo', '<%=PortalConstants.LIST_NEW_LINKED_RELEASES%>', linkedReleases);
-    }
-
-    function ReleaseContentFromAjax(id, what, where, replace) {
-        jQuery.ajax({
-            type: 'POST',
-            url: '<%=viewReleaseURL%>',
-            data: {
-                '<portlet:namespace/><%=PortalConstants.WHAT%>': what,
-                '<portlet:namespace/><%=PortalConstants.WHERE%>': where
-            },
-            success: function (data) {
-                if (replace) {
-                    $('#' + id + " tbody").html(data);
-                } else {
-                    $('#' + id + " tbody").append(data);
-                }
-            }
-        });
-    }
-
-    $(document).ready(function () {
-                bindkeyPressToClick('searchrelease', 'searchbuttonrelease');
-            }
-    );
-</script>
-
-<%@include file="/html/utils/includes/linkedReleaseDelete.jspf" %>
\ No newline at end of file
diff --git a/frontend/sw360-portlet/src/main/webapp/js/main.js b/frontend/sw360-portlet/src/main/webapp/js/main.js
index e63cde10c..56cb1c3e3 100644
--- a/frontend/sw360-portlet/src/main/webapp/js/main.js
+++ b/frontend/sw360-portlet/src/main/webapp/js/main.js
@@ -13,10 +13,10 @@
 var openDialogs = [];
 
 function openDialog(id, focusId, heightPerc, widthPerc) {
-    heightPerc = (heightPerc !== undefined) ? heightPerc : .40;
+    heightPerc = (heightPerc !== undefined) ? heightPerc : .50;
     widthPerc = (widthPerc !== undefined) ? widthPerc : .55;
 
-    var dlgHeight = Math.max((window.innerHeight * heightPerc), 400);
+    var dlgHeight = Math.max((window.innerHeight * heightPerc), 500);
     var dlgWidth = Math.max((window.innerWidth * widthPerc), 600);
 
     var $dialogForm = $("#" + id);
@@ -133,38 +133,6 @@ function renderLinkTo(url, content, htmlContent) {
     return $link[0].outerHTML;
 }
 
-function displayStateBoxes(data) {
-    var project_state  = data[0];
-    var clearing_state = data[1];
-
-    // Add project state color to boxes if the project is active
-    //   (default color is grey)
-    var projectStateBackgroundColour = "projectStateInactive";
-    if( project_state == "Active" ) { // -> green
-        projectStateBackgroundColour = "projectStateActive";
-    }
-
-    // Add clearingstate color to boxes in projects list
-    //   (default color is grey)
-    var clearingStateBackgroundColour = "clearingStateUnknown";
-    switch(clearing_state) {
-        case "Closed": // -> green
-            clearingStateBackgroundColour = "clearingStateClosed";
-            break;
-        case "In Progress": // -> yellow
-            clearingStateBackgroundColour = "clearingStateInProgress";
-            break;
-        case "Open": // -> red
-            clearingStateBackgroundColour = "clearingStateOpen";
-            break;
-    }
-
-    var box_PS = '<div class="stateBox ' + projectStateBackgroundColour + ' capsuleLeft " title="Project state: ' + project_state + '"> PS </div>';
-    var box_CS = '<div class="stateBox capsuleRight ' + clearingStateBackgroundColour + '" title="Project clearing state: ' + clearing_state + '"> CS </div>';
-
-    return box_PS+box_CS;
-}
-
 function renderUserEmail(user) {
     if (typeof user == 'string') {
         return renderLinkTo("mailto:" + user, user);