--- a/src/main/webapp/entry/place.xhtml	Thu Oct 06 19:03:56 2016 +0200
+++ b/src/main/webapp/entry/place.xhtml	Mon Oct 10 19:58:35 2016 +0200
@@ -11,10 +11,10 @@
 	<ui:composition>
 
 		<h:panelGrid>
-			<h:outputText value="City - #{CurrentCity.entity.ownValue}"
+			<h:outputText value="Place - #{CurrentCity.entity.ownValue}"
 				rendered="#{!empty CurrentCity.entity.ownValue}"
 				styleClass="titlePanel"/>
-			<h:outputText value="City"
+			<h:outputText value="Place"
 				rendered="#{empty CurrentCity.entity.ownValue}"
 				styleClass="titlePanel"/>
 		</h:panelGrid>
@@ -22,26 +22,29 @@
 		<h:panelGrid columns="3" styleClass="createPanel"
 			columnClasses="createPanelFirstColumn" id="placePanel">
 
-			<h:outputText value="Country/is part of " />
-			<ismi:autocomplete lo="#{CurrentCity.countryLo}" />
-			<h:panelGrid>
-				<h:commandButton alt="edit" image="#{ApplicationBean1.editImage}"
-					rendered="#{!empty CurrentCity.countryLo.entity.id}"
-					actionListener="#{CurrentCity.editThisCountryAction}" />
-			</h:panelGrid>
-
-			<h:outputText id="name" value="City/Place Name" />
+			<h:outputText id="name" value="Name" />
 			<h:inputText size="100" value="#{CurrentCity.attributes['name']}" />
 			<h:outputText />
 
-			<h:outputText value="Type (choose region for country)" />
+			<h:outputText value="Type" />
 			<h:selectOneListbox size="4" partialSubmit="true"
 				value="#{CurrentCity.attributes['type']}">
 				<f:selectItems value="#{CurrentCity.suggestedTypes}" />
 			</h:selectOneListbox>
 			<h:outputText />
 			
-			<h:outputText value="Places part of this"/>
+            <h:outputText value="This place is part of" />
+            <ismi:autocomplete lo="#{CurrentCity.countryLo}" />
+            <h:panelGrid>
+                <h:commandButton alt="edit" image="#{ApplicationBean1.editImage}"
+                    rendered="#{!empty CurrentCity.countryLo.entity.id}"
+                    actionListener="#{CurrentCity.editThisCountryAction}" />
+                <h:commandButton alt="edit" image="#{ApplicationBean1.imgRemove16}"
+                    rendered="#{!empty CurrentCity.countryLo.entity.id}"
+                    actionListener="#{CurrentCity.removeThisCountryAction}" />
+            </h:panelGrid>
+
+			<h:outputText value="Places that are part of this"/>
 			<h:panelGrid columns="2" id="placePartOfThisPanel">
 				<rich:dataGrid var="place" style="border:none;"
 					value="#{CurrentCity.placesPartOfThis}">
@@ -61,37 +64,7 @@
 						render="placePartOfThisPanel"
 						rendered="#{!empty CurrentCity.placesPartOfThis}"/>			
 			</h:panelGrid>
-			
-			<h:outputText value="People, who lived here"/>
-			<h:panelGrid columns="2" id="peopleLivedInPanel">
-				<rich:dataGrid var="place" style="border:none;"
-					value="#{CurrentCity.peopleLivedIn}">
-					<h:column style="border:none;">
-						<h:selectBooleanCheckbox
-								value="#{place.selected}" />
-					</h:column>
-					<h:column>
-						<h:outputText value="#{place.label}" />
-					</h:column>
-					<h:column>
-						<h:outputLink value="#{ApplicationBean1.root}/search/displayAuthor.xhtml?personId=#{place.obj.id}"
-							title="Display this person">
-							<h:graphicImage url="#{ApplicationBean1.displayImage}" />
-						</h:outputLink>
-					</h:column>										
-				</rich:dataGrid>
-				
-			</h:panelGrid>
-			<h:panelGrid columns="1">
-				<a4j:commandButton
-					value="Remove"
-					actionListener="#{CurrentCity.listenerRemovePeopleLivedIn}"
-					render="peopleLivedInPanel"
-					rendered="#{!empty CurrentCity.peopleLivedIn}"/>
-			</h:panelGrid>			
 						
-			
-			
 		</h:panelGrid>
 
 		<ismi:refWidget entityForm="#{CurrentCity}" />
@@ -105,7 +78,7 @@
 			onclick="#{ApplicationBean1.JSConfirmationCleanForm}" />
 
 		<h:outputText rendered="#{CurrentCity.create_error}"
-			value="City already exists - not saved!" />
+			value="Place already exists - not saved!" />
 
 		<!-- Unity Warning -->
 		<h:panelGrid id="placeUnityWarningPP">