anchor.diff:  	List<String> headerNames = new ArrayList<String>();
   	
   	headerNames.add("no");
  -	/*	headerNames.add("service-no");
  -	headerNames.add("service-name");
  -	headerNames.add("service-domain");
  -	headerNames.add("service-administrator");
  -	headerNames.add("status");
  - */
  +	headerNames.add("service-info");
  +	headerNames.add("service-domain-administrator");
  +
   	boolean isPermission =
  -				    ServicePermission.contains(
  -				        themeDisplay.getPermissionChecker(),
  -				        themeDisplay.getScopeGroupId(), ActionKeys.ADD_SERVICE);
  +		ServicePermission.contains(
  +			themeDisplay.getPermissionChecker(),
  +			themeDisplay.getScopeGroupId(), ActionKeys.ADD_SERVICE);
   
   	if (isPermission) {
   		headerNames.add("action");
   	}
  -	
  -	
  +
   	String headers = StringUtil.merge(headerNames, StringPool.COMMA);
   %>
   
  -<liferay-ui:error key="<%=MessageKeys.SERVICE_DELERR_EXITS_SERVICECONFIG %>" message="<%=MessageKeys.SERVICE_DELERR_EXITS_SERVICECONFIG %>"/>
  -<liferay-ui:error key="<%= MessageKeys.SERVICE_DELERR_EXITS_DOSSIER %>" message="<%=MessageKeys.SERVICE_DELERR_EXITS_DOSSIER %>" />
  -<liferay-ui:error key="<%= MessageKeys.SERVICE_DELERR_EXITS_PROCESSORDER %>" message="<%=MessageKeys.SERVICE_DELERR_EXITS_DOSSIER %>"/>
  -
  -<liferay-ui:success key="<%=MessageKeys.SERVICE_DELSUCC %>" message="<%=MessageKeys.SERVICE_DELSUCC %>"/>
  -
  -
  -<div class="ocps-serviceinfo-list">
  +<liferay-ui:error 
  +	key="<%=MessageKeys.SERVICE_DELERR_EXITS_SERVICECONFIG %>" 
  +	message="<%=MessageKeys.SERVICE_DELERR_EXITS_SERVICECONFIG %>"
  +/>
  +
  +<liferay-ui:error 
  +	key="<%= MessageKeys.SERVICE_DELERR_EXITS_DOSSIER %>" 
  +	message="<%=MessageKeys.SERVICE_DELERR_EXITS_DOSSIER %>" 
  +/>
  +
  +<liferay-ui:error 
  +	key="<%= MessageKeys.SERVICE_DELERR_EXITS_PROCESSORDER %>" 
  +	message="<%=MessageKeys.SERVICE_DELERR_EXITS_DOSSIER %>"
  +/>
  +
  +<liferay-ui:success 
  +	key="<%=MessageKeys.SERVICE_DELSUCC %>" 
  +	message="<%=MessageKeys.SERVICE_DELSUCC %>"
  +/>
  +
   <c:if test="<%= ServicePermission.contains(permissionChecker, scopeGroupId, ActionKeys.ADD_SERVICE) %>">
   	<liferay-util:include page='<%= templatePath + "toptabs.jsp" %>' servletContext="<%=application %>" />
   </c:if>
   
   <liferay-util:include page='<%= templatePath + "toolbar.jsp"%>' servletContext="<%=application %>" />
   
  -<div class="ocps-serviceinfo-search">
  -<liferay-ui:search-container searchContainer="<%= new ServiceSearch(renderRequest, SearchContainer.DEFAULT_DELTA, iteratorURL) %>" 
  -	headerNames="<%= headers %>">
  +<div class="opencps-searchcontainer-wrapper default-box-shadow radius8">
  +
  +	<liferay-ui:search-container 
  +		searchContainer="<%= new ServiceSearch(renderRequest, SearchContainer.DEFAULT_DELTA, iteratorURL) %>" 
  +		headerNames="<%= headers %>"
  +	>
  +			
  +		<liferay-ui:search-container-results>
  +			<%
  +				ServiceSearchTerms searchTerms =
  +					(ServiceSearchTerms) searchContainer.getSearchTerms();
  +
  +				total =
  +					ServiceInfoLocalServiceUtil.countService(
  +						scopeGroupId, searchTerms.getKeywords(),
  +						searchTerms.getAdministrationCode(),
  +						searchTerms.getDomainCode());
  +
  +				results =
  +					ServiceInfoLocalServiceUtil.searchService(
  +						scopeGroupId, searchTerms.getKeywords(),
  +						searchTerms.getAdministrationCode(),
  +						searchTerms.getDomainCode(),
  +						searchContainer.getStart(),
  +						searchContainer.getEnd());
  +
  +				pageContext.setAttribute("results", results);
  +				pageContext.setAttribute("total", total);
  +			%>
  +			
  +		</liferay-ui:search-container-results>
  +	
  +		<liferay-ui:search-container-row 
  +			className="org.opencps.servicemgt.model.ServiceInfo" 
  +			modelVar="serviceInfo" 
  +			keyProperty="serviceinfoId"
  +		>
   		
  -	<liferay-ui:search-container-results>
  -		<%
  -			ServiceSearchTerms searchTerms = (ServiceSearchTerms) searchContainer.getSearchTerms();
  -
  -			total = ServiceInfoLocalServiceUtil.countService(scopeGroupId, searchTerms.getKeywords(), 
  -				searchTerms.getAdministrationCode(), searchTerms.getDomainCode());
  -
  -			results = ServiceInfoLocalServiceUtil.searchService(scopeGroupId, searchTerms.getKeywords(), 
  -				searchTerms.getAdministrationCode(), searchTerms.getDomainCode(),
  -				searchContainer.getStart(), searchContainer.getEnd());
  -			
  -			pageContext.setAttribute("results", results);
  -			pageContext.setAttribute("total", total);
  -		%>
  +			<%
  +				PortletURL editURL = renderResponse.createRenderURL();
  +				editURL.setParameter("mvcPath", templatePath + "edit_service-ux.jsp");
  +				editURL.setParameter("serviceinfoId", String.valueOf(serviceInfo.getServiceinfoId()));
  +				editURL.setParameter("backURL", currentURL);
  +			
  +				int status = serviceInfo.getActiveStatus();
  +				String statusLabel = StringPool.BLANK;
  +				
  +				if(status == 0) {
  +					statusLabel = LanguageUtil.get(portletConfig, themeDisplay.getLocale(), "service-private");
  +				} else if(status == 1) {
  +					statusLabel = LanguageUtil.get(portletConfig, themeDisplay.getLocale(), "service-public");
  +				} else if(status == 2) {
  +					statusLabel = LanguageUtil.get(portletConfig, themeDisplay.getLocale(), "service-outdate");
  +				}
  +			
  +			%>
  +
  +			<liferay-util:buffer var="no">
  +				<div class="row-fluid min-width10">
  +					<div class="span12 bold">
  +						<%=row.getPos() + 1 %>
  +					</div>
  +				</div>
  +			</liferay-util:buffer>
  +			
  +			<liferay-util:buffer var="service">
  +				<div class="row-fluid">
  +					<div class="span3 bold">
  +						<liferay-ui:message key="service-no" />
  +					</div>
  +					<div class="span9">
  +						<%= serviceInfo.getServiceNo() %>
  +					</div>
  +				</div>
  +				
  +				<div class="row-fluid">
  +					<div class="span3 bold">
  +						<liferay-ui:message key="service-name" />
  +					</div>
  +					<div class="span9">
  +						<%= serviceInfo.getServiceName() %>
  +					</div>
  +				</div>
  +			</liferay-util:buffer>
  +			
  +			<liferay-util:buffer var="domain">
  +				<div class="row-fluid">
  +					<div class="span3 bold">
  +						<liferay-ui:message key="service-domain" />
  +					</div>
  +					<div class="span9">
  +						<%= DictItemUtil.getNameDictItem(serviceInfo.getDomainCode()) %>
  +					</div>
  +				</div>
  +				
  +				<div class="row-fluid">
  +					<div class="span3 bold">
  +						<liferay-ui:message key="service-administrator" />
  +					</div>
  +					<div class="span9">
  +						<%=DictItemUtil.getNameDictItem(serviceInfo.getAdministrationCode()) %>
  +					</div>
  +				</div>
  +				
  +				<div class="row-fluid">
  +					<div class="span3 bold">
  +						<liferay-ui:message key="status" />
  +					</div>
  +					<div class="span9">
  +						<%=statusLabel %>
  +					</div>
  +				</div>
  +			</liferay-util:buffer>
  +			<%
  +				row.setClassName("opencps-searchcontainer-row");
  +				
  +				row.addText(no);
  +				
  +				row.addText(service);
  +				
  +				row.addText(domain);
  +				
  +				if(isPermission) {
  +					
  +					row.addJSP("center", SearchEntry.DEFAULT_VALIGN, templatePath + "service_actions.jsp", config.getServletContext(), request, response);
  +				}
  +			%>	
   		
  -	</liferay-ui:search-container-results>
  -
  -	<liferay-ui:search-container-row 
  -		className="org.opencps.servicemgt.model.ServiceInfo" 
  -		modelVar="service" 
  -		keyProperty="serviceinfoId"
  -	>
  -		<%
  -			PortletURL editURL = renderResponse.createRenderURL();
  -			editURL.setParameter("mvcPath", templatePath + "edit_service-ux.jsp");
  -			editURL.setParameter("serviceinfoId", String.valueOf(service.getServiceinfoId()));
  -			editURL.setParameter("backURL", currentURL);
  -			
  -			// no column
  -			row.addText(String.valueOf(row.getPos() + 1), editURL);
  -		
  -			/* // service no
  -			row.addText(service.getServiceNo(), editURL);
  -			
  -			// service name
  -			row.addText(service.getServiceName(), editURL); */
  -			
  -			// service domain
  -			/* row.addText(DictItemUtil.getNameDictItem(service.getDomainCode()) , editURL);
  -			// service admin
  -			row.addText(DictItemUtil.getNameDictItem(service.getAdministrationCode()), editURL);
  -	 */		
  -			//service status
  -			
  -			/* int status = service.getActiveStatus();
  -			String statusMess = StringPool.BLANK;
  -			if(status == 0) {
  -				statusMess = LanguageUtil.get(portletConfig, themeDisplay.getLocale(), "service-private");
  -			} else if(status == 1) {
  -				statusMess = LanguageUtil.get(portletConfig, themeDisplay.getLocale(), "service-public");
  -			} else if(status == 2) {
  -				statusMess = LanguageUtil.get(portletConfig, themeDisplay.getLocale(), "service-outdate");
  -			}
  -			
  -			row.addText(statusMess , editURL); */
  -			row.addJSP("center", SearchEntry.DEFAULT_VALIGN,  templatePath + "service_admin_bound_data_col2.jsp", config.getServletContext(), request, response);
  -			row.addJSP("center", SearchEntry.DEFAULT_VALIGN,  templatePath + "service_admin_bound_data.jsp", config.getServletContext(), request, response);
  -			if(isPermission) {
  -				//action column
  -				row.addJSP("center", SearchEntry.DEFAULT_VALIGN, templatePath + "service_actions.jsp", config.getServletContext(), request, response);
  -			}
  -		%>	
  -	
  -	</liferay-ui:search-container-row>	
  -
  -	<liferay-ui:search-iterator type="opencs_page_iterator"/>
  -
  -</liferay-ui:search-container>
  -</div>
  +		</liferay-ui:search-container-row>	
  +	
  +		<liferay-ui:search-iterator type="opencs_page_iterator"/>
  +	
  +	</liferay-ui:search-container>
   </div>
   <%!
   	private Log _log = LogFactoryUtil.getLog("html.portlets.servicemgt.admin.serviceinfo.jsp");
  
positive.code:  */
  %>
  
  <%@ include file="../init.jsp" %>
  
  <%
  
negative.code: <%
  /**
   * OpenCPS is the open source Core Public Services software
  