diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 1917983dae702dec67b3bf9589c1af425506841a..d397594592538e5dcb7b1299fa5a66241b1f57cf 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -84,12 +84,13 @@ class RegisterController extends Controller
         $data = $request->all();
         $username = $data['username'];
         if(User::where('username',$username)->count()>0) {
-            echo "User already exist";
+            echo '<div class="alert alert-warning alert-dismissible fade show text-center">
+                    <button type="button" class="close" data-dismiss="alert">&times;</button>
+                    <strong>Warning!</strong> This user already exist.
+                  </div>';
+            return view('auth.register');
         } else {
-            echo "Creating user...<br>";
            $user = $this->create($data);
-           echo "User: ".$user->username." created...<br>";
-           echo "Creating Model";
            $role = $data['role'];
            if($role == User::ROLE_DOSEN) {
                Dosen::create(['id'=>$user->id]);
@@ -98,6 +99,7 @@ class RegisterController extends Controller
            } else if($role == User::ROLE_MANAJER) {
                Manajer::create(['id'=>$user->id]);
            }
+           return view('manajer.index');
         }
 //        echo $id;
 
diff --git a/resources/views/dosen/detail_mahasiswa.blade.php b/resources/views/dosen/detail_mahasiswa.blade.php
index 7867ea0cb2c9d1cbe9d2aec537a155e536480858..36e962c73c7d1565786dc5aa9618660f79a45e3e 100644
--- a/resources/views/dosen/detail_mahasiswa.blade.php
+++ b/resources/views/dosen/detail_mahasiswa.blade.php
@@ -41,17 +41,25 @@
                     </div>
                 </div>
                 <div class="row mt-3 justify-content-center ">
-                    <a href="/seminartesis/create/{{$mahasiswa->user()->username}}"class="mb-4">
-                    <button class="btn btn-blue">
-                        Buat Pengajuan Seminar Tesis
-                    </button>
-                    </a>
+                    @if($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_TESIS)
+                        <fieldset disabled="disabled" class="mb-4">
+                    @endif
+                        <a href="/seminartesis/create/{{$mahasiswa->user()->username}}"class="mb-4">
+                            <button class="btn btn-blue">
+                                Buat Pengajuan Seminar Tesis
+                            </button>
+                        </a>
+                    </fieldset>
+                    @if($mahasiswa->status == \App\Mahasiswa::STATUS_LULUS)
+                    <fieldset disabled="disabled">
+                    @endif
                     @if($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_TESIS)
                         <a href="/sidangtesis/create/{{$mahasiswa->user()->username}}" class="mb-4">
                             <button class="btn btn-blue">
                                 Buat Pengajuan Sidang Tesis
                             </button>
                         </a>
+                    </fieldset>
                     @endif
                 </div>
 
@@ -144,7 +152,7 @@
                                         </div>
                                     </form>
                                 </div>
-                    </div>
+                                </fieldset>
                     @endif
                     @endif
                 @endif
@@ -263,6 +271,7 @@
                             </form>
                         </div>
                     </div>
+                    </fieldset>
                 @endif
                 @if($seminarTesis)
                 @if($seminarTesis->tesis->dosen_pembimbing1 == Auth::user()->id && $seminarTesis->approval_pembimbing1 && ($seminarTesis->approval_pembimbing2 || !$tesis->dosen_pembimbing2))
@@ -294,6 +303,7 @@
                             </form>
                         </div>
                     </div>
+                    </fieldset>
                 @endif
                 @endif
                 @if($mahasiswa->status >= \App\Mahasiswa::STATUS_SIAP_SEMINAR_TESIS)
@@ -384,6 +394,7 @@
                             </form>
                         </div>
                     </div>
+                    </fieldset>
                 @endif
                 @if($mahasiswa->status >= \App\Mahasiswa::STATUS_MASA_BIMBINGAN || $mahasiswa->status < \App\Mahasiswa::STATUS_GAGAL_SEMINAR_PROPOSAL )
                     @php($hasilBimbinganAktif = $mahasiswa->tesis()->getHasilBimbinganAktif())
diff --git a/resources/views/mahasiswa/index.blade.php b/resources/views/mahasiswa/index.blade.php
index daa279c3760fa0e71a44e1d267e0957e5bf43715..242134078d46c2b2064eb441d1b95b8f9d9a0b67 100644
--- a/resources/views/mahasiswa/index.blade.php
+++ b/resources/views/mahasiswa/index.blade.php
@@ -189,6 +189,10 @@
             <div id="step1" class="container tab-pane fade">
         @endif
                 <h3 class="header">Seminar Topik</h3>
+                @if ($mahasiswa->seminarTopik() and $mahasiswa->status!=\App\Mahasiswa::STATUS_GAGAL_SEMINAR_TOPIK)
+                    <p>Jadwal yang ditetapkan: <h4><span class="badge badge-info">{{date("d M Y H:i:s", strtotime($mahasiswa->seminarTopik()->schedule.'UTC'))}}</span></h4></p>
+                    
+                @endif
                 @if($mahasiswa->status >= \App\Mahasiswa::STATUS_TOPIK_TELAH_DIAJUKAN ||
                     $mahasiswa->status == \App\Mahasiswa::STATUS_TOPIK_DITOLAK ||
                     $mahasiswa->status == \App\Mahasiswa::STATUS_PROPOSAL_DITOLAK ||
diff --git a/resources/views/manajer/penjadwalan.blade.php b/resources/views/manajer/penjadwalan.blade.php
index 3329566d87643d424eabf1d12b4bdc873d0ce18d..a2f7baf5a666996051f6964a9bac4e01f9fcf81b 100644
--- a/resources/views/manajer/penjadwalan.blade.php
+++ b/resources/views/manajer/penjadwalan.blade.php
@@ -44,6 +44,7 @@
                             </tr>
                             </thead>
 
+                            @php($count = 0)
                             @foreach($topik as $item)
                                 <tr class="text-center">
                                     <td>
@@ -64,11 +65,12 @@
                                         <input type="datetime-local" id="sch{{$item->topic->mahasiswa_id}}" name="sch{{$item->topic->mahasiswa_id}}" class="form-control col-lg-12 " value="" onkeyup="updateSaveButton()">
                                     </td>
                                 </tr>
+                                @php($count++)
                             @endforeach
                             @foreach($seminar_topik as $item)
                                 <tr class="text-center">
                                     <td>
-                                        {{$loop->iteration}}
+                                        {{$loop->iteration + $count}}
                                     </td>
                                     <td>
                                         {{$item->topik->topic->mahasiswa->user()->username}}
@@ -116,7 +118,7 @@
                                 <th></th>
                             </tr>
                             </thead>
-
+                            @php($count = 0)
                             @foreach($proposal as $item)
                                 <tr class="text-center">
                                     <td>
@@ -134,11 +136,12 @@
                                         <input type="datetime-local" id="sch{{$item->mahasiswa_id}}" name="sch{{$item->mahasiswa_id}}" class="form-control col-lg-12 " value="" onkeyup="updateSaveButton2()">
                                     </td>
                                 </tr>
+                                @php($count++)
                             @endforeach
                             @foreach($seminar_proposal as $item)
                                 <tr class="text-center">
                                     <td>
-                                        {{$loop->iteration}}
+                                        {{$loop->iteration + $count}}
                                     </td>
                                     <td>
                                         {{$item->mahasiswa->user()->username}}