diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 3e178a8ab182963a060e208f1186a0aaffc768f0..0102f4c1a9a97d424e1024b1a99f4ac9dac9c760 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -51,4 +51,13 @@ class HomeController extends Controller
 
         return view('home', ['profile' => $profile, 'role' => $role, 'courses' => $courses, 'teachers' => $teachers, 'enrolled' => $enrolled]);
     }
+
+    public function profile(Request $request)
+    {
+        DB::table('users')->where('id', Auth::id())->update([
+            'name' => $request->new_name,
+        ]);
+        
+        return redirect()->route('home', ['msg' => 1]);
+    }
 }
diff --git a/app/Http/Controllers/LearnController.php b/app/Http/Controllers/LearnController.php
index 9b81636331e3442d051a4c383d9c977664092f3f..5c3cbac6080d1f11c6a7bd2f154cc4133c8d1c58 100644
--- a/app/Http/Controllers/LearnController.php
+++ b/app/Http/Controllers/LearnController.php
@@ -36,7 +36,7 @@ class LearnController extends Controller
 
         $permission_response = LearnController::edit_permission($response->id);
 
-        return view('learn', ['id_spreadsheet' => $response->id, 'content' => $content]);
+        return view('learn', ['topic_name' => $topic->name, 'id_course' => $id_course, 'id_spreadsheet' => $response->id, 'content' => $content]);
     }
 
     /**
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index f23113698207127363f65f054c58d4b6e98ec56b..9f17ae56a8bf981d552cfd3ff5f050be7dda0a21 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -2,6 +2,16 @@
 
 @section('content')
 <div class="container">
+@isset(request()->msg)
+    @if( request()->get('msg') == 1 )
+        <div class="alert alert-success alert-dismissible fade show" role="alert">
+            Profil Berhasil Diubah
+            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                <span aria-hidden="true">&times;</span>
+            </button>
+        </div>
+    @endif
+@endisset
     <div class="row justify-content">
         <div class="col-md-8">
             <div class="card">
@@ -24,8 +34,35 @@
                     <img src="img/profile.jpg" style="width:120px;height:120px;" alt="No Picture"> <br/> <br/>
                     <a id="name">{{ $profile->name }}</a> <br/>
                     <a id="email">{{ $profile->email }}</a> <br/>
-                    <a id="role">{{ $role }}</a> <br/>
-                    <a id="edit" href="/edit_profile" class="btn btn-primary" role="button">Edit Profil</a>
+                    <a id="role">{{ $role }}</a> <br/><br/>
+                    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#exampleModalCenter">
+                        Edit Profile
+                    </button>
+                    <div class="modal fade" id="exampleModalCenter" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
+                        <div class="modal-dialog modal-dialog-centered" role="document">
+                            <div class="modal-content">
+                                <form action="/profile" method="post">
+                                    {{ csrf_field() }}
+                                    <div class="modal-header">
+                                        <h5 class="modal-title" id="exampleModalCenterTitle">Edit Profil</h5>
+                                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                                        <span aria-hidden="true">&times;</span>
+                                        </button>
+                                    </div>
+                                    <div class="modal-body">
+                                        <div class="form-group">
+                                            <label for="topic-name" class="col-form-label">Nama</label>
+                                            <input type="text" class="form-control" name="new_name" id="new_name" required="required" value="<?php echo $profile->name ?>">
+                                        </div>
+                                    </div>
+                                    <div class="modal-footer">
+                                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Batal</button>
+                                        <button type="submit" class="btn btn-primary">Submit</button>
+                                    </div>
+                                </form>
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 4d7ae8364dc99a98734821db7ab180e66dafe610..69d67e082e9c3afefe87a689bc88bb791eebb083 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -13,6 +13,7 @@
     <script src="{{ asset('js/app.js') }}" defer></script>
     <script src="{{ asset('js/text.js') }}" defer></script>
     <script src="{{ asset('js/learn.js') }}" defer></script>
+    <script src="{{ asset('js/home.js') }}" defer></script>
     <script src="https://cdn.tiny.cloud/1/yaezxtmh9h1roazzxnkx70is63n62nbov3xskxim3rpnbcoj/tinymce/5/tinymce.min.js" referrerpolicy="origin"></script>
     <script>tinymce.init({selector:'textarea'});</script>
 
diff --git a/resources/views/learn.blade.php b/resources/views/learn.blade.php
index 856d9afa09f650d3790c5f71e8d4537e31bc6ba6..3f1d5df94996f560bbced8bbd4ba0a7151f9da70 100644
--- a/resources/views/learn.blade.php
+++ b/resources/views/learn.blade.php
@@ -5,7 +5,7 @@
     <div class="row justify-content-center">
         <div class="col-lg-4">
             <div class="card">
-                <div class="card-header">Judul</div>
+                <div class="card-header">{{ $topic_name }}</div>
                 <div class="card-body">
                     <?php echo $content;?>
                 </div>
@@ -17,6 +17,7 @@
                 frameBorder="0"
                 src="https://docs.google.com/spreadsheets/d/<?php echo $id_spreadsheet; ?>/edit?usp=drivesdk&rm=embedded">
             </iframe>
+            <a href="/course/<?php echo $id_course; ?>" class="btn btn-primary" role="button">Kembali ke Kelas</a>
             <button id="submit" style="float: right;" type="text" onclick="submit('<?php echo $id_spreadsheet; ?>', '<?php echo Request::url(); ?>/submit')" class="btn btn-success"><b>Submit</b></button>
         </div>
         <div  id="result" class="col-lg-10" style="margin-top: 1rem; display:none">
diff --git a/routes/web.php b/routes/web.php
index 7b30b804c53a6b5e4bc89aa7dbe64e8bbddf3491..d2ce600aaae5c7427432c127645919b1a4358f97 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -19,6 +19,7 @@ Route::get('/', function () {
 Auth::routes();
 Route::get('/home', 'HomeController@index')->name('home');
 Route::get('/test', 'AutograderController@test')->name('test');
+Route::post('/profile', 'HomeController@profile')->name('profile');
 Route::get('/course/{id_course}', 'CourseController@index')->name('course');
 Route::post('/course/{id_course}/learn/new', 'LearnController@new')->name('learn/new');
 Route::get('/course/{id_course}/learn/{id_topic}', 'LearnController@index')->name('learn');