diff --git a/src/pages/Bootcamp.tsx b/src/pages/Bootcamp.tsx
index 02ee94d..d8d1d34 100644
--- a/src/pages/Bootcamp.tsx
+++ b/src/pages/Bootcamp.tsx
@@ -408,22 +408,29 @@ export default function Bootcamp() {
                   {isLessonCompleted(selectedLesson.id) ? (
                     <>
                       <Check className="w-4 h-4 mr-2" />
-                      Sudah Selesai
+                      Selesai
                     </>
                   ) : (
                     'Tandai Selesai'
                   )}
                 </Button>
 
-                <Button
-                  variant="outline"
-                  onClick={goToNextLesson}
-                  disabled={modules.flatMap(m => m.lessons).findIndex(l => l.id === selectedLesson.id) === modules.flatMap(m => m.lessons).length - 1}
-                  className="border-2"
-                >
-                  Selanjutnya
-                  <ChevronRight className="w-4 h-4 ml-2" />
-                </Button>
+                {isBootcampCompleted ? (
+                  <Button onClick={() => setReviewModalOpen(true)} className="shadow-sm">
+                    <Star className="w-4 h-4 mr-2" />
+                    Beri Ulasan
+                  </Button>
+                ) : (
+                  <Button
+                    variant="outline"
+                    onClick={goToNextLesson}
+                    disabled={modules.flatMap(m => m.lessons).findIndex(l => l.id === selectedLesson.id) === modules.flatMap(m => m.lessons).length - 1}
+                    className="border-2"
+                  >
+                    Selanjutnya
+                    <ChevronRight className="w-4 h-4 ml-2" />
+                  </Button>
+                )}
               </div>
 
               {/* Bootcamp completion review prompt */}
diff --git a/src/pages/ProductDetail.tsx b/src/pages/ProductDetail.tsx
index c8fa715..89b81bd 100644
--- a/src/pages/ProductDetail.tsx
+++ b/src/pages/ProductDetail.tsx
@@ -254,6 +254,9 @@ export default function ProductDetail() {
           </Button>
         );
       case 'webinar':
+        // Check if webinar has ended
+        const webinarEnded = product.event_start && new Date(product.event_start) <= new Date();
+
         if (product.recording_url) {
           return (
             <div className="space-y-4">
@@ -274,14 +277,25 @@ export default function ProductDetail() {
             </div>
           );
         }
-        return product.meeting_link ? (
-          <Button asChild size="lg" className="shadow-sm">
-            <a href={product.meeting_link} target="_blank" rel="noopener noreferrer">
-              <Video className="w-4 h-4 mr-2" />
-              Gabung Webinar
-            </a>
-          </Button>
-        ) : <Badge className="bg-primary text-primary-foreground">Rekaman segera tersedia</Badge>;
+
+        // Only show "Gabung Webinar" if webinar hasn't ended and has meeting link
+        if (!webinarEnded && product.meeting_link) {
+          return (
+            <Button asChild size="lg" className="shadow-sm">
+              <a href={product.meeting_link} target="_blank" rel="noopener noreferrer">
+                <Video className="w-4 h-4 mr-2" />
+                Gabung Webinar
+              </a>
+            </Button>
+          );
+        }
+
+        // Webinar has ended but no recording yet
+        if (webinarEnded) {
+          return <Badge className="bg-muted text-primary">Rekaman segera tersedia</Badge>;
+        }
+
+        return null;
       case 'bootcamp':
         return (
           <Button onClick={() => navigate(`/bootcamp/${product.slug}`)} size="lg" className="shadow-sm">