diff --git a/ofu_app/apps/donar/urls.py b/ofu_app/apps/donar/urls.py
index 1c256b4..7d6f90f 100644
--- a/ofu_app/apps/donar/urls.py
+++ b/ofu_app/apps/donar/urls.py
@@ -19,4 +19,7 @@ from apps.donar import views
 
 urlpatterns = [
     url(r'^$', views.home, name='donar'),
+    url(r'^all$', views.all_rooms, name='all-rooms'),
+    url(r'^search/$', views.search_room, name='search-rooms'),
+    url(r'^search/(?P<room>.+/.+)/$', views.show_room, name='show-room'),
 ]
diff --git a/ofu_app/apps/donar/views.py b/ofu_app/apps/donar/views.py
index ad03459..06edf8f 100644
--- a/ofu_app/apps/donar/views.py
+++ b/ofu_app/apps/donar/views.py
@@ -5,5 +5,24 @@ from apps.donar.models import Room
 
 # Create your views here.
 def home(request):
+    return render(request, 'donar/home.jinja', {})
+
+
+def all_rooms(request):
     rooms = Room.objects.all()
-    return render(request, 'donar/home.jinja', {'rooms': rooms})
+    return render(request, 'donar/all_rooms.jinja', {'rooms': rooms})
+
+
+def search_room(request):
+    id = request.GET.get('search_room', None)
+    if id:
+        # create a form instance and populate it with data from the request:
+        rooms = Room.objects.filter(short__contains=id)
+        return render(request, 'donar/search_rooms.jinja', {'id': id, 'rooms': rooms})
+
+    return render(request, 'donar/search_rooms.jinja', {})
+
+
+def show_room(request, room):
+    room = Room.objects.get(short=room)
+    return render(request, 'donar/show_room.jinja', {'room': room})
diff --git a/ofu_app/templates/donar/all_rooms.jinja b/ofu_app/templates/donar/all_rooms.jinja
new file mode 100644
index 0000000..5011938
--- /dev/null
+++ b/ofu_app/templates/donar/all_rooms.jinja
@@ -0,0 +1,25 @@
+{% extends 'base.jinja' %}
+{% block headline %}
+    <h1 class="text-center">Alle Räume an der OFU </h1>
+{% endblock %}
+{% block content %}
+    <div class="container">
+        <div class="row">
+            {% for room in  rooms %}
+                <div class="col-6 p-3">
+                    <div class="p-3 border border-dark roundep-3 border border-dark rounded bg-light text-dark">
+                        <h3>{{ room.name }}</h3>
+                        <p><strong>Key:</strong> {{ room.key }}</p>
+                        <p><strong>Address:</strong>  {{ room.address }}</p>
+                        <p><strong>Building Key:</strong>  {{ room.building_key }}</p>
+                        <p><strong>Floor:</strong>  {{ room.floor }}</p>
+                        <p><strong>Orgname:</strong>  {{ room.orgname }}</p>
+                        <p><strong>Short:</strong>  {{ room.short }}</p>
+                        <p><strong>Size:</strong>  {{ room.size }}</p>
+                        <p><strong>Description:</strong>  {{ room.description }}</p>
+                    </div>
+                </div>
+            {% endfor %}
+        </div>
+    </div>
+{% endblock %}
\ No newline at end of file
diff --git a/ofu_app/templates/donar/home.jinja b/ofu_app/templates/donar/home.jinja
index 5011938..ddc5e20 100644
--- a/ofu_app/templates/donar/home.jinja
+++ b/ofu_app/templates/donar/home.jinja
@@ -1,25 +1,13 @@
 {% extends 'base.jinja' %}
+{% import '/macros/overview_pages.jinja' as macros %}
 {% block headline %}
-    <h1 class="text-center">Alle Räume an der OFU </h1>
+    <h1 class="text-center">App für Studenten der Universität Bamberg</h1>
 {% endblock %}
 {% block content %}
-    <div class="container">
+    <div class="container text-dark">
         <div class="row">
-            {% for room in  rooms %}
-                <div class="col-6 p-3">
-                    <div class="p-3 border border-dark roundep-3 border border-dark rounded bg-light text-dark">
-                        <h3>{{ room.name }}</h3>
-                        <p><strong>Key:</strong> {{ room.key }}</p>
-                        <p><strong>Address:</strong>  {{ room.address }}</p>
-                        <p><strong>Building Key:</strong>  {{ room.building_key }}</p>
-                        <p><strong>Floor:</strong>  {{ room.floor }}</p>
-                        <p><strong>Orgname:</strong>  {{ room.orgname }}</p>
-                        <p><strong>Short:</strong>  {{ room.short }}</p>
-                        <p><strong>Size:</strong>  {{ room.size }}</p>
-                        <p><strong>Description:</strong>  {{ room.description }}</p>
-                    </div>
-                </div>
-            {% endfor %}
+            {{ macros.home_item(title='All Rooms', url_id='all-rooms', description='Übersicht über alle Lehrräume an der Universität Bamberg.') }}
+            {{ macros.home_item(title='Search Rooms', url_id='search-rooms', description='Du weißt nicht wo du hin musst? Hier kannst du ihn finden.') }}
         </div>
     </div>
 {% endblock %}
\ No newline at end of file
diff --git a/ofu_app/templates/donar/search_rooms.jinja b/ofu_app/templates/donar/search_rooms.jinja
new file mode 100644
index 0000000..931857a
--- /dev/null
+++ b/ofu_app/templates/donar/search_rooms.jinja
@@ -0,0 +1,30 @@
+{% extends 'base.jinja' %}
+{% block headline %}
+    <h1 class="text-center"> Donar </h1>
+{% endblock %}
+{% block content %}
+    <div class="container">
+        <div class="row pt-5">
+            <form type="get" action="{{ url('search-rooms') }}" style="margin: 0">
+                <input id="search_room" type="text" name="search_room" placeholder="Search...">
+                <button id="search_submit" type="submit">Submit</button>
+            </form>
+        </div>
+        <div class="row mt-4">
+            {% if id %}
+                <h2>Ergebnisse für: {{ id }}</h2>
+            {% endif %}
+        </div>
+        <div class="row">
+            {% if rooms %}
+                {% for room in  rooms %}
+                    <div class="col-12 p-1">
+                        <div class="p-2 border border-dark rounded-3 border border-dark rounded bg-light text-dark">
+                            <a href="{{ url('show-room', args=[room.short]) }}"><p><strong>Short:</strong> {{ room.short }}</p></a>
+                        </div>
+                    </div>
+                {% endfor %}
+            {% endif %}
+        </div>
+    </div>
+{% endblock %}
diff --git a/ofu_app/templates/donar/show_room.jinja b/ofu_app/templates/donar/show_room.jinja
new file mode 100644
index 0000000..c561129
--- /dev/null
+++ b/ofu_app/templates/donar/show_room.jinja
@@ -0,0 +1,25 @@
+{% extends 'base.jinja' %}
+{% block headline %}
+    <h1 class="text-center"> Donar </h1>
+{% endblock %}
+{% block content %}
+    <div class="container">
+        <div class="row">
+            {% if room %}
+                <div class="col-6 p-3">
+                    <div class="p-3 border border-dark roundep-3 border border-dark rounded bg-light text-dark">
+                        <h3>{{ room.name }}</h3>
+                        <p><strong>Key:</strong> {{ room.key }}</p>
+                        <p><strong>Address:</strong> {{ room.address }}</p>
+                        <p><strong>Building Key:</strong> {{ room.building_key }}</p>
+                        <p><strong>Floor:</strong> {{ room.floor }}</p>
+                        <p><strong>Orgname:</strong> {{ room.orgname }}</p>
+                        <p><strong>Short:</strong> {{ room.short }}</p>
+                        <p><strong>Size:</strong> {{ room.size }}</p>
+                        <p><strong>Description:</strong> {{ room.description }}</p>
+                    </div>
+                </div>
+            {% endif %}
+        </div>
+    </div>
+{% endblock %}