diff --git a/app/Benutzer.php b/app/Benutzer.php
index 52930832..dd653a1d 100644
--- a/app/Benutzer.php
+++ b/app/Benutzer.php
@@ -6,5 +6,5 @@ use Illuminate\Database\Eloquent\Model;
 
 class Benutzer extends User
 {
-    protected $table = "benutzer";
+    protected $table = "users";
 }
diff --git a/app/Eintragung.php b/app/Eintragung.php
index f1e97219..d4568207 100644
--- a/app/Eintragung.php
+++ b/app/Eintragung.php
@@ -7,4 +7,13 @@ use Illuminate\Database\Eloquent\Model;
 class Eintragung extends Model
 {
     protected $table = "eintragungen";
+    protected $dates = ['kann_ab', 'kann_bis'];
+
+    public function veranstaltung(){
+    	return $this->belongsTo('App\Veranstaltung');
+    }
+
+    public function user(){
+    	return $this->belongsTo('App\User');
+    }
 }
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index ed8d1b77..48dec1db 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -51,6 +51,7 @@ class RegisterController extends Controller
             'name' => 'required|string|max:255',
             'email' => 'required|string|email|max:255|unique:users',
             'password' => 'required|string|min:6|confirmed',
+            'anzeigename' => 'required|string|unique:users'
         ]);
     }
 
@@ -66,6 +67,8 @@ class RegisterController extends Controller
             'name' => $data['name'],
             'email' => $data['email'],
             'password' => bcrypt($data['password']),
+            'anzeigename' => $data['anzeigename'],
+            'telefon' => $data['telefon']
         ]);
     }
 }
diff --git a/app/Http/Controllers/EintragController.php b/app/Http/Controllers/EintragController.php
new file mode 100644
index 00000000..c2024903
--- /dev/null
+++ b/app/Http/Controllers/EintragController.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Eintragung;
+use Illuminate\Http\Request;
+
+class EintragController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        //
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  \App\Eintragung  $eintragung
+     * @return \Illuminate\Http\Response
+     */
+    public function show(Eintragung $eintragung)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \App\Eintragung  $eintragung
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(Eintragung $eintragung)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\Eintragung  $eintragung
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, Eintragung $eintragung)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\Eintragung  $eintragung
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(Eintragung $eintragung)
+    {
+        //
+    }
+}
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
new file mode 100644
index 00000000..a3af7dd8
--- /dev/null
+++ b/app/Http/Controllers/HomeController.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class HomeController extends Controller
+{
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    /**
+     * Show the application dashboard.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        return view('home');
+    }
+}
diff --git a/app/Http/Controllers/VeranstaltungController.php b/app/Http/Controllers/VeranstaltungController.php
index 68feff6c..bdc92e9d 100644
--- a/app/Http/Controllers/VeranstaltungController.php
+++ b/app/Http/Controllers/VeranstaltungController.php
@@ -27,9 +27,10 @@ class VeranstaltungController extends Controller
     {
         $v = new Veranstaltung();
         $v->beginn = \Carbon\Carbon::today();
+        $v->gaeste = 0;
 
-        return view ('veranstaltung.create', ['model' =>
-            $v]);
+        return view ('veranstaltung.create',
+            $v);
     }
 
     /**
@@ -65,7 +66,9 @@ class VeranstaltungController extends Controller
      */
     public function show(Veranstaltung $veranstaltung)
     {
-        
+        if ($veranstaltung->has('eintragungen')) {
+         $veranstaltung->eintragungen;
+        }
         return view('veranstaltung.show', $veranstaltung);
     }
 
diff --git a/app/Policies/EintragPolicy.php b/app/Policies/EintragPolicy.php
new file mode 100644
index 00000000..bc215cff
--- /dev/null
+++ b/app/Policies/EintragPolicy.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Policies;
+
+use App\User;
+use App\Eintragung;
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class EintragPolicy
+{
+    use HandlesAuthorization;
+
+    /**
+     * Determine whether the user can view the eintragung.
+     *
+     * @param  \App\User  $user
+     * @param  \App\Eintragung  $eintragung
+     * @return mixed
+     */
+    public function view(User $user, Eintragung $eintragung)
+    {
+        //
+    }
+
+    /**
+     * Determine whether the user can create eintragungs.
+     *
+     * @param  \App\User  $user
+     * @return mixed
+     */
+    public function create(User $user)
+    {
+        //
+    }
+
+    /**
+     * Determine whether the user can update the eintragung.
+     *
+     * @param  \App\User  $user
+     * @param  \App\Eintragung  $eintragung
+     * @return mixed
+     */
+    public function update(User $user, Eintragung $eintragung)
+    {
+        //
+    }
+
+    /**
+     * Determine whether the user can delete the eintragung.
+     *
+     * @param  \App\User  $user
+     * @param  \App\Eintragung  $eintragung
+     * @return mixed
+     */
+    public function delete(User $user, Eintragung $eintragung)
+    {
+        //
+    }
+}
diff --git a/app/Policies/VeranstaltungPolicy.php b/app/Policies/VeranstaltungPolicy.php
new file mode 100644
index 00000000..81e4a1c7
--- /dev/null
+++ b/app/Policies/VeranstaltungPolicy.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Policies;
+
+use App\User;
+use App\Veranstaltung;
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class VeranstaltungPolicy
+{
+    use HandlesAuthorization;
+
+    /**
+     * Determine whether the user can view the veranstaltung.
+     *
+     * @param  \App\User  $user
+     * @param  \App\Veranstaltung  $veranstaltung
+     * @return mixed
+     */
+    public function view(User $user, Veranstaltung $veranstaltung)
+    {
+        
+    }
+
+    /**
+     * Determine whether the user can create veranstaltungs.
+     *
+     * @param  \App\User  $user
+     * @return mixed
+     */
+    public function create(User $user)
+    {
+        //
+    }
+
+    /**
+     * Determine whether the user can update the veranstaltung.
+     *
+     * @param  \App\User  $user
+     * @param  \App\Veranstaltung  $veranstaltung
+     * @return mixed
+     */
+    public function update(User $user, Veranstaltung $veranstaltung)
+    {
+        //
+    }
+
+    /**
+     * Determine whether the user can delete the veranstaltung.
+     *
+     * @param  \App\User  $user
+     * @param  \App\Veranstaltung  $veranstaltung
+     * @return mixed
+     */
+    public function delete(User $user, Veranstaltung $veranstaltung)
+    {
+        //
+    }
+
+    public function eintragen(User $user,Veranstaltung $veranstaltung)
+    {
+
+    }
+}
diff --git a/app/User.php b/app/User.php
index bfd96a6a..fa323391 100644
--- a/app/User.php
+++ b/app/User.php
@@ -8,14 +8,13 @@ use Illuminate\Foundation\Auth\User as Authenticatable;
 class User extends Authenticatable
 {
     use Notifiable;
-
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'name', 'email', 'password',
+        'name', 'email', 'password', 'anzeigename', 'telefon'
     ];
 
     /**
@@ -26,4 +25,14 @@ class User extends Authenticatable
     protected $hidden = [
         'password', 'remember_token',
     ];
+
+    public function eintragungen(){
+        return $this->hasMany('App\Eintragung');
+    }
+    public function einteilungen(){
+        return $this->hasMany('App\Einteilung');
+    }
+    public function arbeitszeiten(){
+        return $this->hasMany('App\Arbeitszeit');
+    }
 }
diff --git a/app/Veranstaltung.php b/app/Veranstaltung.php
index 6d4da0b7..45d5c69d 100644
--- a/app/Veranstaltung.php
+++ b/app/Veranstaltung.php
@@ -11,4 +11,12 @@ class Veranstaltung extends Model
     protected $fillable = ['name','beginn','ende','geaste','hinweise'];
 
     protected $dates = ['beginn', 'ende'];
+
+    public function eintragungen(){
+    	return $this->hasMany('App\Eintragung');
+    }
+
+    public function einteilungen(){
+    	return $this->hasMany('App\Einteilung');
+    }
 }
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
new file mode 100644
index 00000000..757d821d
--- /dev/null
+++ b/resources/views/auth/login.blade.php
@@ -0,0 +1,68 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row">
+        <div class="col-md-8 col-md-offset-2">
+            <div class="panel panel-default">
+                <div class="panel-heading">Login</div>
+                <div class="panel-body">
+                    <form class="form-horizontal" role="form" method="POST" action="{{ route('login') }}">
+                        {{ csrf_field() }}
+
+                        <div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
+                            <label for="email" class="col-md-4 control-label">E-Mail Address</label>
+
+                            <div class="col-md-6">
+                                <input id="email" type="email" class="form-control" name="email" value="{{ old('email') }}" required autofocus>
+
+                                @if ($errors->has('email'))
+                                    <span class="help-block">
+                                        <strong>{{ $errors->first('email') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
+                            <label for="password" class="col-md-4 control-label">Password</label>
+
+                            <div class="col-md-6">
+                                <input id="password" type="password" class="form-control" name="password" required>
+
+                                @if ($errors->has('password'))
+                                    <span class="help-block">
+                                        <strong>{{ $errors->first('password') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <div class="col-md-6 col-md-offset-4">
+                                <div class="checkbox">
+                                    <label>
+                                        <input type="checkbox" name="remember" {{ old('remember') ? 'checked' : '' }}> Remember Me
+                                    </label>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <div class="col-md-8 col-md-offset-4">
+                                <button type="submit" class="btn btn-primary">
+                                    Login
+                                </button>
+
+                                <a class="btn btn-link" href="{{ route('password.request') }}">
+                                    Forgot Your Password?
+                                </a>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
new file mode 100644
index 00000000..e566cfb0
--- /dev/null
+++ b/resources/views/auth/passwords/email.blade.php
@@ -0,0 +1,46 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row">
+        <div class="col-md-8 col-md-offset-2">
+            <div class="panel panel-default">
+                <div class="panel-heading">Reset Password</div>
+                <div class="panel-body">
+                    @if (session('status'))
+                        <div class="alert alert-success">
+                            {{ session('status') }}
+                        </div>
+                    @endif
+
+                    <form class="form-horizontal" role="form" method="POST" action="{{ route('password.email') }}">
+                        {{ csrf_field() }}
+
+                        <div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
+                            <label for="email" class="col-md-4 control-label">E-Mail Address</label>
+
+                            <div class="col-md-6">
+                                <input id="email" type="email" class="form-control" name="email" value="{{ old('email') }}" required>
+
+                                @if ($errors->has('email'))
+                                    <span class="help-block">
+                                        <strong>{{ $errors->first('email') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <div class="col-md-6 col-md-offset-4">
+                                <button type="submit" class="btn btn-primary">
+                                    Send Password Reset Link
+                                </button>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
new file mode 100644
index 00000000..6ed9298a
--- /dev/null
+++ b/resources/views/auth/passwords/reset.blade.php
@@ -0,0 +1,76 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row">
+        <div class="col-md-8 col-md-offset-2">
+            <div class="panel panel-default">
+                <div class="panel-heading">Reset Password</div>
+
+                <div class="panel-body">
+                    @if (session('status'))
+                        <div class="alert alert-success">
+                            {{ session('status') }}
+                        </div>
+                    @endif
+
+                    <form class="form-horizontal" role="form" method="POST" action="{{ route('password.request') }}">
+                        {{ csrf_field() }}
+
+                        <input type="hidden" name="token" value="{{ $token }}">
+
+                        <div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
+                            <label for="email" class="col-md-4 control-label">E-Mail Address</label>
+
+                            <div class="col-md-6">
+                                <input id="email" type="email" class="form-control" name="email" value="{{ $email or old('email') }}" required autofocus>
+
+                                @if ($errors->has('email'))
+                                    <span class="help-block">
+                                        <strong>{{ $errors->first('email') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
+                            <label for="password" class="col-md-4 control-label">Password</label>
+
+                            <div class="col-md-6">
+                                <input id="password" type="password" class="form-control" name="password" required>
+
+                                @if ($errors->has('password'))
+                                    <span class="help-block">
+                                        <strong>{{ $errors->first('password') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group{{ $errors->has('password_confirmation') ? ' has-error' : '' }}">
+                            <label for="password-confirm" class="col-md-4 control-label">Confirm Password</label>
+                            <div class="col-md-6">
+                                <input id="password-confirm" type="password" class="form-control" name="password_confirmation" required>
+
+                                @if ($errors->has('password_confirmation'))
+                                    <span class="help-block">
+                                        <strong>{{ $errors->first('password_confirmation') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <div class="col-md-6 col-md-offset-4">
+                                <button type="submit" class="btn btn-primary">
+                                    Reset Password
+                                </button>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
new file mode 100644
index 00000000..937d03be
--- /dev/null
+++ b/resources/views/auth/register.blade.php
@@ -0,0 +1,89 @@
+@extends('layouts.app')
+@section('title','Neuer Benutzer');
+
+@section('content')
+    <div class="row">
+            <div class="panel panel-default">
+                <div class="panel-heading">Register</div>
+                <div class="panel-body">
+                    <form class="form-horizontal" role="form" method="POST" action="{{ route('register') }}">
+                        {{ csrf_field() }}
+
+                        <div class="form-group{{ $errors->has('name') ? ' has-error' : '' }}">
+                            <label for="name" class="col-md-4 control-label">Name</label>
+
+                            <div class="col-md-6">
+                                <input id="name" type="text" class="form-control" name="name" value="{{ old('name') }}" required autofocus>
+
+                                @if ($errors->has('name'))
+                                    <span class="help-block">
+                                        <strong>{{ $errors->first('name') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
+                            <label for="email" class="col-md-4 control-label">E-Mail Address</label>
+
+                            <div class="col-md-6">
+                                <input id="email" type="email" class="form-control" name="email" value="{{ old('email') }}" required>
+
+                                @if ($errors->has('email'))
+                                    <span class="help-block">
+                                        <strong>{{ $errors->first('email') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
+                            <label for="password" class="col-md-4 control-label">Password</label>
+
+                            <div class="col-md-6">
+                                <input id="password" type="password" class="form-control" name="password" required>
+
+                                @if ($errors->has('password'))
+                                    <span class="help-block">
+                                        <strong>{{ $errors->first('password') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="password-confirm" class="col-md-4 control-label">Confirm Password</label>
+
+                            <div class="col-md-6">
+                                <input id="password-confirm" type="password" class="form-control" name="password_confirmation" required>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="anzeigename" class="col-md-4 control-label">Anzeigename</label>
+
+                            <div class="col-md-6">
+                                <input id="anzeigename" type="text" class="form-control" name="anzeigename" required>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="telefon" class="col-md-4 col-form-label">Anzeigename</label>
+
+                            <div class="col-md-6">
+                                <input id="telefon" type="text" class="form-control" name="telefon" required>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <div class="col-md-6 col-md-offset-4">
+                                <button type="submit" class="btn btn-primary">
+                                    Register
+                                </button>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+        </div>
+    </div>
+@endsection
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
new file mode 100644
index 00000000..de73a980
--- /dev/null
+++ b/resources/views/home.blade.php
@@ -0,0 +1,17 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row">
+        <div class="col-md-8 col-md-offset-2">
+            <div class="panel panel-default">
+                <div class="panel-heading">Dashboard</div>
+
+                <div class="panel-body">
+                    You are logged in!
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 6a790ba2..d19e87fa 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -1,5 +1,5 @@
 <html>
-    <head>
+    <head lang="{{ config('app.locale') }}">
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -18,15 +18,22 @@
 
               <div class="collapse navbar-collapse" id="navbarSupportedContent">
                 <ul class="navbar-nav mr-auto">
-                  <li class="nav-item active">
-                    <a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a>
-                  </li>
-                  <li class="nav-item">
-                    <a class="nav-link" href="{{ route('veranstaltung.index') }}">Veranstaltungen</a>
-                  </li>
-                  <li class="nav-item">
-                    <a class="nav-link disabled" href="#">Disabled</a>
-                  </li>
+                  
+                  @if(Auth::check())
+                    <li class="nav-item active">
+                      <a class="nav-link" href="{{ route('home') }}">Home <span class="sr-only">(current)</span></a>
+                    </li>
+                    <li class="nav-item">
+                      <a class="nav-link" href="{{ route('veranstaltung.index') }}">Veranstaltungen</a>
+                    </li>
+                  @else
+                    <li class="nav-item active">
+                      <a class="nav-link" href="{{ route('register') }}">Register</a>
+                    </li>
+                    <li class="nav-item">
+                      <a class="nav-link" href="{{ route('login') }}">Login</a>
+                    </li>
+                  @endif
                 </ul>
                 <form class="form-inline my-2 my-lg-0">
                   <input class="form-control mr-sm-2" type="text" placeholder="Search">
diff --git a/resources/views/veranstaltung/create.blade.php b/resources/views/veranstaltung/create.blade.php
index d9013422..4b048241 100644
--- a/resources/views/veranstaltung/create.blade.php
+++ b/resources/views/veranstaltung/create.blade.php
@@ -6,31 +6,33 @@
 		<div class="row">
 			<div class="form-group col-md-8">
 				<label for="name">Veranstaltungsname</label>
-				<input type="text" name="name" class="form-control" id="title" aria-describedby="nameHelp" placeholder="Veranstaltungsnamen eingeben" value="{{ $model->name or "" }}" required>
+				<input type="text" name="name" class="form-control" id="title" aria-describedby="nameHelp" placeholder="Veranstaltungsnamen eingeben" value="{{ $name or "" }}" required>
 				<small id="nameHelp" class="form-text text-muted">Die Bezeichnung der Veranstaltung, welcher in der Übersicht angezeigt wird.</small>
 			</div>
 			<div class="form-group col-md-4">
 				<label for="gaeste">Anzahl der Gäste</label>
-				<input type="number" name="gaeste" class="form-control" id="gaeste" aria-describedby="gaesteHelp" placeholder="Gastanzahl eingeben">
+				<input type="number" name="gaeste" class="form-control" id="gaeste" aria-describedby="gaesteHelp" placeholder="Gastanzahl eingeben" value="{{ $gaeste ?: 100 }}">
 				<small id="gaesteHelp" class="form-text text-muted">Die ungefähre Anzahl an Gästen zur Veranstaltung</small>
 			</div>
 		</div>
 		<div class="row">
 			<div class="form-group col-md-6">
 				<label for="beginn">Veranstaltungsbeginn</label>
-				<input type="datetime-local" name="beginn" class="form-control" id="beginn" aria-describedby="beginnHelp" placeholder="Veranstaltungsbeginn eingeben" value="{{ $model->beginn->format('Y-m-d\TH:i:s') }}" required>
+				<input type="datetime-local" name="beginn" class="form-control" id="beginn" aria-describedby="beginnHelp" placeholder="Veranstaltungsbeginn eingeben" value="{{ \Carbon\Carbon::parse($beginn)->format('Y-m-d\TH:i:s') }}" required>
 				<small id="beginnHelp" class="form-text text-muted">Der Zeitpunkt, an dem die Veranstaltung beginnt.</small>
 			</div>
 			<div class="form-group col-md-6">
 				<label for="ende">Veranstaltungsende</label>
-				<input type="datetime-local" name="ende" class="form-control" id="ende" aria-describedby="endeHelp" placeholder="Veranstaltungende eingeben">
+				<input type="datetime-local" name="ende" class="form-control" id="ende" aria-describedby="endeHelp" placeholder="Veranstaltungende eingeben" value="{{ !empty($ende) ? $ende : "" }}">
 				<small id="beginnHelp" class="form-text text-muted">Der Zeitpunkt, an dem die Veranstaltung wahrscheinlich endet. (optional)</small>
 			</div>
 		</div>
 		<div class="row">
 			<div class="form-group col-md-12">
 				<label for="Hinweise">Hinweise</label>
-				<textarea class="form-control" name="hinweise" id="hinweise" aria-describedby="hinweiseHelp" rows="3"></textarea>
+				<textarea class="form-control" name="hinweise" id="hinweise" aria-describedby="hinweiseHelp" rows="3">
+					{{ $hinweise or ""}}
+				</textarea>
 				<small id="hinweiseHelp" class="form-text text-muted">Hinweise zur Veranstalung</small>
 			</div>
 		</div>
diff --git a/resources/views/veranstaltung/index.blade.php b/resources/views/veranstaltung/index.blade.php
index b913b45d..727a5e21 100644
--- a/resources/views/veranstaltung/index.blade.php
+++ b/resources/views/veranstaltung/index.blade.php
@@ -2,6 +2,8 @@
 @section('title', 'Veranstaltungen')
 
 @section('content')
+	<a class="btn btn-link" href="{{ route('veranstaltung.create') }}">Veranstaltung hinzufügen</a>
+
 	<table class="table">
 		<thead>
 			<tr>
@@ -16,7 +18,7 @@
 			<td>{{ $v->name }}</td>
 			<td>{{ $v->beginn->format('d.m.Y') }}</td>
 			<td>{{ $v->beginn->format('H:i') }}</td>
-			<td>
+			<td class="row">
 				<a class="btn btn-link m-0" href="{{ route('veranstaltung.show', [$v]) }}">Details</a>
 				<a class="btn btn-link m-0" href="{{ route('veranstaltung.edit', [$v]) }}">Bearbeiten</a>
 				<a class="btn btn-link m-0" href="{{ route('veranstaltung.enter', [$v]) }}">Eintragen</a>
diff --git a/resources/views/veranstaltung/show.blade.php b/resources/views/veranstaltung/show.blade.php
index bf5e29f4..619511f6 100644
--- a/resources/views/veranstaltung/show.blade.php
+++ b/resources/views/veranstaltung/show.blade.php
@@ -30,6 +30,16 @@
 		<dd class="col-md-10">
 			{{ $hinweise }}
 		</dd>
+		<dt class="col-md-2">
+			Eintragungen
+		</dt>
+		<dd class="col-md-10">
+			<ul>
+			@foreach ($eintragungen as $eintrag)
+				<li> {{ $eintrag->user_id OR "keiner"}}
+			@endforeach
+			</ul>
+		</dd>
 	</dl>
 	<hr/>
 	<a class="btn btn-link" href="{{ route('veranstaltung.edit', ['id' => $id]) }}">Bearbeiten</a>
diff --git a/routes/web.php b/routes/web.php
index 2c8a21c2..2bf6418a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -15,6 +15,12 @@ Route::get('/', function () {
     return view('welcome');
 });
 
-Route::get('veranstaltung/{veranstaltung}/enter', 'VeranstaltungController@enter')
+Route::get('veranstaltung/{veranstaltung}/eintragen', 'VeranstaltungController@enter')
 	->name('veranstaltung.enter');
 Route::resource('veranstaltung','VeranstaltungController');
+
+Route::resource('eintrag','EintragController');
+
+Auth::routes();
+
+Route::get('/home', 'HomeController@index')->name('home');