diff --git a/Resources/Private/Language/de.locallang.xlf b/Resources/Private/Language/de.locallang.xlf
index b3c0ad6f6e5a0ed93d4a12623cd81a0a49562ffc..23ec5c591a67b92369255eee2079d1ae8bcb2c23 100644
--- a/Resources/Private/Language/de.locallang.xlf
+++ b/Resources/Private/Language/de.locallang.xlf
@@ -9,6 +9,22 @@
 			<authorEmail>fabian@sgalinski.de</authorEmail>
 		</header>
 		<body>
+		<trans-unit id="backend.button_create" approved="yes">
+			<source>New</source>
+			<target>Neu</target>
+		</trans-unit>
+		<trans-unit id="backend.filter" approved="yes">
+			<source>Filter</source>
+			<target>Filter</target>
+		</trans-unit>
+		<trans-unit id="backend.filters.locations" approved="yes">
+			<source>Locations</source>
+			<target>Arbeitsorte</target>
+		</trans-unit>
+		<trans-unit id="backend.filters.search" approved="yes">
+			<source>Search</source>
+			<target>Suchen</target>
+		</trans-unit>
 		<trans-unit id="backend.list.header" approved="yes">
 			<source>Header</source>
 			<target>Kopf</target>
@@ -17,22 +33,18 @@
 			<source>Item</source>
 			<target>Eintrag</target>
 		</trans-unit>
-		<trans-unit id="frontend.listAll.item" approved="yes">
-			<source>Item</source>
-			<target>Eintrag</target>
+		<trans-unit id="frontend.detail.back" approved="yes">
+			<source>Back</source>
+			<target>Zurück</target>
 		</trans-unit>
 		<trans-unit id="frontend.detail.header" approved="yes">
 			<source>Header</source>
 			<target>Kopf</target>
 		</trans-unit>
-		<trans-unit id="frontend.detail.back" approved="yes">
-			<source>Back</source>
-			<target>Zurück</target>
-		</trans-unit>
-		<trans-unit id="backend.button_create" approved="yes">
-			<source>New</source>
-			<target>Neu</target>
+		<trans-unit id="frontend.listAll.item" approved="yes">
+			<source>Item</source>
+			<target>Eintrag</target>
 		</trans-unit>
 		</body>
 	</file>
-</xliff>
+</xliff>
\ No newline at end of file
diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf
index 2691feec96dc07958d07a5e8b2616bf79c0405a1..50ca77d44a981150ffd3b6d497a716e5db30b72b 100644
--- a/Resources/Private/Language/locallang.xlf
+++ b/Resources/Private/Language/locallang.xlf
@@ -9,24 +9,33 @@
 			<authorEmail>fabian@sgalinski.de</authorEmail>
 		</header>
 		<body>
+		<trans-unit id="backend.button_create">
+			<source>New</source>
+		</trans-unit>
+		<trans-unit id="backend.filter">
+			<source>Filter</source>
+		</trans-unit>
+		<trans-unit id="backend.filters.locations">
+			<source>Locations</source>
+		</trans-unit>
+		<trans-unit id="backend.filters.search">
+			<source>Search</source>
+		</trans-unit>
 		<trans-unit id="backend.list.header">
 			<source>Header</source>
 		</trans-unit>
 		<trans-unit id="backend.list.item">
 			<source>Item</source>
 		</trans-unit>
-		<trans-unit id="frontend.listAll.item">
-			<source>Item</source>
+		<trans-unit id="frontend.detail.back">
+			<source>Back</source>
 		</trans-unit>
 		<trans-unit id="frontend.detail.header">
 			<source>Header</source>
 		</trans-unit>
-		<trans-unit id="frontend.detail.back">
-			<source>Back</source>
-		</trans-unit>
-		<trans-unit id="backend.button_create">
-			<source>New</source>
+		<trans-unit id="frontend.listAll.item">
+			<source>Item</source>
 		</trans-unit>
 		</body>
 	</file>
-</xliff>
+</xliff>
\ No newline at end of file
diff --git a/Resources/Private/Templates/Backend/Index.html b/Resources/Private/Templates/Backend/Index.html
index bc28984b57efc49feca45eefa592362e7d0a5ae8..76a8e61288eda3fdfc60bdd6d0da0071637529c8 100644
--- a/Resources/Private/Templates/Backend/Index.html
+++ b/Resources/Private/Templates/Backend/Index.html
@@ -8,29 +8,16 @@
 <f:section name="headline">
 </f:section>
 <f:section name="content">
-	<f:debug>{_all}</f:debug>
 	<f:if condition="{rootPageUid}">
 		<f:then>
 			<f:form action="list" controller="Route" method="post" objectName="filters" object="{filters}">
 				<div class="row">
 					<div class="col-xs-6">
 						<div class="form-group">
-							<label for="filter-categories">
-								<f:translate key="backend.filters.categories" />
+							<label for="filter-locations">
+								<f:translate key="backend.filters.locations" />
 							</label>
-							<f:form.select class="form-control" multiple="1" size="4" property="categories" options="{categoryOptions}" id="filter-categories" />
-							<small>
-								<f:format.raw><f:translate key="backend.filters.categories.description" /></f:format.raw>
-							</small>
-							<br />
-							<a href="#" class="btn btn-default" onclick="editSelectedCategory();">
-								<span class="t3js-icon icon icon-size-small icon-state-default icon-actions-document-new">
-									<span class="icon-markup">
-										<img src="/typo3/sysext/core/Resources/Public/Icons/T3Icons/actions/actions-document-open.svg" width="16" height="16">
-									</span>
-								</span>
-								<f:translate key="backend.filters.editCategory" />
-							</a>
+							<f:form.select class="form-control" multiple="1" size="4" property="locations" options="{locationOptions}" id="filter-locations" />
 						</div>
 					</div>
 					<div class="col-xs-6">