diff --git a/src/pages/ConsultingBooking.tsx b/src/pages/ConsultingBooking.tsx
index 9a2953f..4929ac4 100644
--- a/src/pages/ConsultingBooking.tsx
+++ b/src/pages/ConsultingBooking.tsx
@@ -650,7 +650,13 @@ export default function ConsultingBooking() {
 
                         <div className="text-right">
                           <p className="text-xs text-muted-foreground">Selesai</p>
-                          <p className="font-bold text-lg">{selectedRange.end}</p>
+                          <p className="font-bold text-lg">
+                            {(() => {
+                              const start = parse(selectedRange.end, 'HH:mm', new Date());
+                              const end = addMinutes(start, settings?.consulting_block_duration_minutes || 30);
+                              return format(end, 'HH:mm');
+                            })()}
+                          </p>
                         </div>
                       </div>
 
diff --git a/src/pages/admin/AdminConsulting.tsx b/src/pages/admin/AdminConsulting.tsx
index 5d9a6c8..1d8cec5 100644
--- a/src/pages/admin/AdminConsulting.tsx
+++ b/src/pages/admin/AdminConsulting.tsx
@@ -15,7 +15,7 @@ import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
 import { toast } from '@/hooks/use-toast';
 import { formatIDR } from '@/lib/format';
 import { Video, Calendar, Clock, User, Link as LinkIcon, ExternalLink, CheckCircle, XCircle, Loader2, Search, X } from 'lucide-react';
-import { format, parseISO, isToday, isTomorrow, isPast } from 'date-fns';
+import { format, parseISO, isToday, isTomorrow, isPast, parse, differenceInMinutes } from 'date-fns';
 import { id } from 'date-fns/locale';
 
 interface ConsultingSession {
@@ -64,9 +64,12 @@ export default function AdminConsulting() {
   const [dialogOpen, setDialogOpen] = useState(false);
   const [saving, setSaving] = useState(false);
   const [creatingMeet, setCreatingMeet] = useState(false);
+  const [deletingMeet, setDeletingMeet] = useState(false);
   const [activeTab, setActiveTab] = useState('upcoming');
   const [searchQuery, setSearchQuery] = useState('');
   const [filterStatus, setFilterStatus] = useState<string>('all');
+  const [editStartTime, setEditStartTime] = useState('');
+  const [editEndTime, setEditEndTime] = useState('');
 
   useEffect(() => {
     if (!authLoading) {
@@ -112,45 +115,78 @@ export default function AdminConsulting() {
   const openMeetDialog = (session: ConsultingSession) => {
     setSelectedSession(session);
     setMeetLink(session.meet_link || '');
+    setEditStartTime(session.start_time.substring(0, 5));
+    setEditEndTime(session.end_time.substring(0, 5));
     setDialogOpen(true);
   };
 
+  const deleteMeetLink = async () => {
+    if (!selectedSession) return;
+
+    // Delete calendar event if exists
+    if (selectedSession.calendar_event_id) {
+      setDeletingMeet(true);
+      try {
+        await supabase.functions.invoke('delete-calendar-event', {
+          body: { session_id: selectedSession.id }
+        });
+        toast({ title: 'Berhasil', description: 'Event kalender dihapus' });
+      } catch (err) {
+        console.log('Failed to delete calendar event:', err);
+        toast({ title: 'Warning', description: 'Gagal menghapus event kalender', variant: 'destructive' });
+      }
+      setDeletingMeet(false);
+    }
+
+    // Clear meet link from database
+    const { error } = await supabase
+      .from('consulting_sessions')
+      .update({ meet_link: null })
+      .eq('id', selectedSession.id);
+
+    if (error) {
+      toast({ title: 'Error', description: error.message, variant: 'destructive' });
+    } else {
+      toast({ title: 'Berhasil', description: 'Link Google Meet dihapus' });
+      setMeetLink('');
+      fetchSessions();
+    }
+  };
+
   const saveMeetLink = async () => {
     if (!selectedSession) return;
     setSaving(true);
 
+    // Prepare update data
+    const updateData: any = {
+      meet_link: meetLink || null
+    };
+
+    // Check if time changed
+    const newStartTime = editStartTime + ':00';
+    const newEndTime = editEndTime + ':00';
+    if (newStartTime !== selectedSession.start_time || newEndTime !== selectedSession.end_time) {
+      updateData.start_time = newStartTime;
+      updateData.end_time = newEndTime;
+
+      // Recalculate duration
+      const start = parse(newStartTime, 'HH:mm', new Date());
+      const end = parse(newEndTime, 'HH:mm', new Date());
+      const durationMinutes = differenceInMinutes(end, start);
+      updateData.total_duration_minutes = durationMinutes;
+    }
+
     const { error } = await supabase
       .from('consulting_sessions')
-      .update({ meet_link: meetLink })
+      .update(updateData)
       .eq('id', selectedSession.id);
 
     if (error) {
       toast({ title: 'Error', description: error.message, variant: 'destructive' });
     } else {
-      toast({ title: 'Berhasil', description: 'Link Google Meet disimpan' });
+      toast({ title: 'Berhasil', description: 'Perubahan disimpan' });
       setDialogOpen(false);
       fetchSessions();
-
-      // Send notification to client with meet link
-      if (meetLink && selectedSession.profiles?.email) {
-        try {
-          await supabase.functions.invoke('send-notification', {
-            body: {
-              template_key: 'consulting_scheduled',
-              recipient_email: selectedSession.profiles.email,
-              recipient_name: selectedSession.profiles.name,
-              variables: {
-                consultation_date: format(parseISO(selectedSession.session_date), 'd MMMM yyyy', { locale: id }),
-                consultation_time: `${selectedSession.start_time.substring(0, 5)} - ${selectedSession.end_time.substring(0, 5)}`,
-                meet_link: meetLink,
-                topic_category: selectedSession.topic_category,
-              },
-            },
-          });
-        } catch (err) {
-          console.log('Notification skipped:', err);
-        }
-      }
     }
     setSaving(false);
   };
@@ -757,50 +793,113 @@ export default function AdminConsulting() {
         }}>
           <DialogContent className="max-w-md border-2 border-border">
             <DialogHeader>
-              <DialogTitle>Link Google Meet</DialogTitle>
+              <DialogTitle>Edit Sesi Konsultasi</DialogTitle>
               <DialogDescription>
-                Tambahkan atau edit link Google Meet untuk sesi ini
+                Edit waktu, link Google Meet, dan kelola event kalender
               </DialogDescription>
             </DialogHeader>
             <div className="space-y-4 py-4">
               {selectedSession && (
                 <div className="p-3 bg-muted rounded-lg text-sm space-y-1">
                   <p><strong>Tanggal:</strong> {format(parseISO(selectedSession.session_date), 'd MMMM yyyy', { locale: id })}</p>
-                  <p><strong>Waktu:</strong> {selectedSession.start_time.substring(0, 5)} - {selectedSession.end_time.substring(0, 5)}</p>
                   <p><strong>Klien:</strong> {selectedSession.profiles?.name}</p>
                   <p><strong>Topik:</strong> {selectedSession.topic_category}</p>
                   {selectedSession.notes && <p><strong>Catatan:</strong> {selectedSession.notes}</p>}
+                  {selectedSession.calendar_event_id && (
+                    <p className="text-xs text-green-600"><strong>✓ Event Kalender:</strong> Terhubung</p>
+                  )}
                 </div>
               )}
 
+              {/* Time Editing */}
               <div className="space-y-2">
-                <Input
-                  value={meetLink}
-                  onChange={(e) => setMeetLink(e.target.value)}
-                  placeholder="https://meet.google.com/xxx-xxxx-xxx"
-                  className="border-2"
-                />
+                <label className="text-sm font-medium">Waktu Sesi</label>
+                <div className="flex gap-2 items-center">
+                  <div className="flex-1">
+                    <Input
+                      type="time"
+                      value={editStartTime}
+                      onChange={(e) => setEditStartTime(e.target.value)}
+                      className="border-2"
+                    />
+                  </div>
+                  <span className="text-muted-foreground">→</span>
+                  <div className="flex-1">
+                    <Input
+                      type="time"
+                      value={editEndTime}
+                      onChange={(e) => setEditEndTime(e.target.value)}
+                      className="border-2"
+                    />
+                  </div>
+                </div>
+                <p className="text-xs text-muted-foreground">
+                  Durasi: {editStartTime && editEndTime ?
+                    `${differenceInMinutes(parse(editEndTime, 'HH:mm', new Date()), parse(editStartTime, 'HH:mm', new Date()))} menit` :
+                    '-'}
+                </p>
               </div>
 
-              <div className="flex gap-2">
-                <Button
-                  onClick={createMeetLink}
-                  variant="outline"
-                  className="flex-1 border-2"
-                  disabled={creatingMeet}
-                >
-                  {creatingMeet ? (
-                    <>
-                      <Loader2 className="w-4 h-4 mr-2 animate-spin" />
-                      Membuat...
-                    </>
-                  ) : (
-                    'Buat Link Meet'
-                  )}
-                </Button>
-                <Button onClick={saveMeetLink} disabled={saving} className="flex-1 shadow-sm">
-                  {saving ? 'Menyimpan...' : 'Simpan'}
-                </Button>
+              {/* Meet Link */}
+              <div className="space-y-2">
+                <label className="text-sm font-medium">Link Google Meet</label>
+                <div className="flex gap-2">
+                  <Input
+                    value={meetLink}
+                    onChange={(e) => setMeetLink(e.target.value)}
+                    placeholder="https://meet.google.com/xxx-xxxx-xxx"
+                    className="border-2 flex-1"
+                  />
+                </div>
+              </div>
+
+              {/* Action Buttons */}
+              <div className="space-y-2">
+                {/* Create/Regenerate Meet Link */}
+                <div className="flex gap-2">
+                  <Button
+                    onClick={createMeetLink}
+                    variant="outline"
+                    className="flex-1 border-2"
+                    disabled={creatingMeet}
+                  >
+                    {creatingMeet ? (
+                      <>
+                        <Loader2 className="w-4 h-4 mr-2 animate-spin" />
+                        Membuat...
+                      </>
+                    ) : meetLink ? (
+                      'Regenerate Link'
+                    ) : (
+                      'Buat Link Meet'
+                    )}
+                  </Button>
+                  <Button onClick={saveMeetLink} disabled={saving} className="flex-1 shadow-sm">
+                    {saving ? 'Menyimpan...' : 'Simpan Perubahan'}
+                  </Button>
+                </div>
+
+                {/* Delete Meet Link (only shown if link exists) */}
+                {meetLink && (
+                  <Button
+                    onClick={deleteMeetLink}
+                    variant="outline"
+                    className="w-full border-2 text-destructive hover:text-destructive"
+                    disabled={deletingMeet}
+                  >
+                    {deletingMeet ? (
+                      <>
+                        <Loader2 className="w-4 h-4 mr-2 animate-spin" />
+                        Menghapus...
+                      </>
+                    ) : (
+                      <>
+                        <XCircle className="w-4 h-4 mr-2" />
+                        Hapus Link & Event Kalender
+                      </>
+                    )}
+                  </Button>
+                )}
               </div>
 
               {!settings.integration_n8n_base_url && (
diff --git a/supabase/functions/create-google-meet-event/index.ts b/supabase/functions/create-google-meet-event/index.ts
index 7e0cacc..affa843 100644
--- a/supabase/functions/create-google-meet-event/index.ts
+++ b/supabase/functions/create-google-meet-event/index.ts
@@ -235,7 +235,7 @@ serve(async (req: Request): Promise<Response> => {
 
     const eventData = {
       summary: `Konsultasi: ${body.topic} - ${body.client_name}`,
-      description: `Client: ${body.client_email}\n\nNotes: ${body.notes || '-'}\n\nSlot ID: ${body.slot_id}`,
+      description: `Kategori: ${body.topic}\n\nClient: ${body.client_email}\n\nCatatan: ${body.notes || '-'}\n\nSession ID: ${body.slot_id}`,
       start: {
         dateTime: startDate.toISOString(),
         timeZone: "Asia/Jakarta",
diff --git a/supabase/functions/delete-order/index.ts b/supabase/functions/delete-order/index.ts
index 05372e4..25fcc57 100644
--- a/supabase/functions/delete-order/index.ts
+++ b/supabase/functions/delete-order/index.ts
@@ -32,6 +32,31 @@ serve(async (req: Request): Promise<Response> => {
     const supabaseServiceKey = Deno.env.get("SUPABASE_SERVICE_ROLE_KEY")!;
     const supabase = createClient(supabaseUrl, supabaseServiceKey);
 
+    // Get consulting sessions for this order to delete calendar events
+    const { data: sessions } = await supabase
+      .from("consulting_sessions")
+      .select("id, calendar_event_id")
+      .eq("order_id", order_id);
+
+    if (sessions && sessions.length > 0) {
+      console.log("[DELETE-ORDER] Found consulting sessions:", sessions.length);
+
+      // Delete calendar events for each session
+      for (const session of sessions) {
+        if (session.calendar_event_id) {
+          try {
+            await supabase.functions.invoke('delete-calendar-event', {
+              body: { session_id: session.id }
+            });
+            console.log("[DELETE-ORDER] Deleted calendar event for session:", session.id);
+          } catch (err) {
+            console.log("[DELETE-ORDER] Failed to delete calendar event:", err);
+            // Continue with order deletion even if calendar deletion fails
+          }
+        }
+      }
+    }
+
     // Call the database function to delete the order
     const { data, error } = await supabase
       .rpc("delete_order", { order_uuid: order_id });