diff --git a/web_dev/sas_web/meingoethopia/admin.py b/web_dev/sas_web/meingoethopia/admin.py
index a1aa5a9..bab343f 100644
--- a/web_dev/sas_web/meingoethopia/admin.py
+++ b/web_dev/sas_web/meingoethopia/admin.py
@@ -7,6 +7,7 @@ from django.shortcuts import render
 from django.template.defaulttags import register
 from django.db import models
 from django import forms
+from easy_select2 import apply_select2
 
 
 class ZugeteiltFilter(admin.SimpleListFilter):
@@ -88,6 +89,10 @@ create_overview.short_description = "Übersicht erstellen"
 class AufsichtInline(admin.TabularInline):
     model = Betriebsaufsicht
     extra = 0
+    formfield_overrides = {
+        models.ManyToManyField: {'widget': forms.CheckboxSelectMultiple},
+        models.ForeignKey: {'widget': apply_select2(forms.Select)}
+    }
 
 
 # Register your models here.
@@ -99,6 +104,7 @@ class BetriebAdmin(admin.ModelAdmin):
     search_fields = ('name', 'manager', 'raum', 'aufsicht')
     formfield_overrides = {
         models.ManyToManyField: {'widget': forms.CheckboxSelectMultiple},
+        models.ForeignKey: {'widget': apply_select2(forms.Select)}
     }
     actions = [ban_ip, create_overview]
     filter_horizontal = ('angestellte',)
@@ -133,6 +139,10 @@ class AngestellterAdmin(admin.ModelAdmin):
 class AufsichtAdmin(admin.ModelAdmin):
     list_display = ('name', 'show_stunden')
     search_fields = ('name',)
+    formfield_overrides = {
+        models.ManyToManyField: {'widget': forms.CheckboxSelectMultiple},
+        models.ForeignKey: {'widget': apply_select2(forms.Select)}
+    }
 
 admin.site.register(Betrieb, BetriebAdmin)
 admin.site.register(Partei, ParteiAdmin)
diff --git a/web_dev/sas_web/meingoethopia/models.py b/web_dev/sas_web/meingoethopia/models.py
index b57d18e..5c99953 100644
--- a/web_dev/sas_web/meingoethopia/models.py
+++ b/web_dev/sas_web/meingoethopia/models.py
@@ -28,8 +28,8 @@ class Angestellter(models.Model):
 
 class Aufsicht(models.Model):
     name = models.CharField('Name', max_length=100)
-    stunden = models.IntegerField('Deputatsstunden', default=25,
-                                  help_text='Verfügbare Deputatsstunde (Dreiviertel Stunden) von Dienstag bis Freitag')
+    stunden = models.FloatField('Deputatsstunden', default=25,
+                                help_text='Verfügbare Deputatsstunde (Dreiviertel Stunden) von Dienstag bis Freitag')
 
     def __str__(self):
         return self.name
@@ -109,7 +109,7 @@ class Betrieb(models.Model):
 class Betriebsaufsicht(models.Model):
     aufsicht = models.ForeignKey(Aufsicht)
     betrieb = models.ForeignKey(Betrieb)
-    teilstunden = models.IntegerField('Geleistete Deputatsstunden', default=16)
+    teilstunden = models.FloatField('Geleistete Deputatsstunden', default=16)
 
     def __str__(self):
         return self.aufsicht.name
diff --git a/web_dev/sas_web/sas_web/settings.py b/web_dev/sas_web/sas_web/settings.py
index dfe0638..3880aa2 100644
--- a/web_dev/sas_web/sas_web/settings.py
+++ b/web_dev/sas_web/sas_web/settings.py
@@ -54,6 +54,7 @@ INSTALLED_APPS = (
     'datenbank',
     'meingoethopia',
     'startpage',
+    'easy_select2',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',