diff --git a/.env b/.env
index c22d1734..c1e19f61 100644
--- a/.env
+++ b/.env
@@ -1 +1 @@
-VERSION=1.4.0
\ No newline at end of file
+VERSION=1.5.0
\ No newline at end of file
diff --git a/src/ui/Admin/AdminSettings.tsx b/src/ui/Admin/AdminSettings.tsx
index 718d406c..bece9c0a 100644
--- a/src/ui/Admin/AdminSettings.tsx
+++ b/src/ui/Admin/AdminSettings.tsx
@@ -16,7 +16,6 @@ import {
     TableRow,
 } from "@/components/ui/table.tsx";
 import {Shield, Trash2, Users} from "lucide-react";
-import {toast} from "sonner";
 import { 
     getOIDCConfig, 
     getRegistrationAllowed, 
@@ -53,11 +52,11 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
         token_url: '',
         identifier_path: 'sub',
         name_path: 'name',
-        scopes: 'openid email profile',
-        userinfo_url: ''
+        scopes: 'openid email profile'
     });
     const [oidcLoading, setOidcLoading] = React.useState(false);
     const [oidcError, setOidcError] = React.useState<string | null>(null);
+    const [oidcSuccess, setOidcSuccess] = React.useState<string | null>(null);
 
     const [users, setUsers] = React.useState<Array<{
         id: string;
@@ -69,6 +68,7 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
     const [newAdminUsername, setNewAdminUsername] = React.useState("");
     const [makeAdminLoading, setMakeAdminLoading] = React.useState(false);
     const [makeAdminError, setMakeAdminError] = React.useState<string | null>(null);
+    const [makeAdminSuccess, setMakeAdminSuccess] = React.useState<string | null>(null);
 
     React.useEffect(() => {
         const jwt = getCookie("jwt");
@@ -120,6 +120,7 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
         e.preventDefault();
         setOidcLoading(true);
         setOidcError(null);
+        setOidcSuccess(null);
 
         const required = ['client_id', 'client_secret', 'issuer_url', 'authorization_url', 'token_url'];
         const missing = required.filter(f => !oidcConfig[f as keyof typeof oidcConfig]);
@@ -132,7 +133,7 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
         const jwt = getCookie("jwt");
         try {
             await updateOIDCConfig(oidcConfig);
-            toast.success("OIDC configuration updated successfully!");
+            setOidcSuccess("OIDC configuration updated successfully!");
         } catch (err: any) {
             setOidcError(err?.response?.data?.error || "Failed to update OIDC configuration");
         } finally {
@@ -144,15 +145,16 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
         setOidcConfig(prev => ({...prev, [field]: value}));
     };
 
-    const handleMakeUserAdmin = async (e: React.FormEvent) => {
+    const makeUserAdmin = async (e: React.FormEvent) => {
         e.preventDefault();
         if (!newAdminUsername.trim()) return;
         setMakeAdminLoading(true);
         setMakeAdminError(null);
+        setMakeAdminSuccess(null);
         const jwt = getCookie("jwt");
         try {
             await makeUserAdmin(newAdminUsername.trim());
-            toast.success(`User ${newAdminUsername} is now an admin`);
+            setMakeAdminSuccess(`User ${newAdminUsername} is now an admin`);
             setNewAdminUsername("");
             fetchUsers();
         } catch (err: any) {
@@ -162,29 +164,23 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
         }
     };
 
-    const handleRemoveAdminStatus = async (username: string) => {
+    const removeAdminStatus = async (username: string) => {
         if (!confirm(`Remove admin status from ${username}?`)) return;
         const jwt = getCookie("jwt");
         try {
             await removeAdminStatus(username);
-            toast.success(`Admin status removed from ${username}`);
             fetchUsers();
-        } catch (err: any) {
-            console.error('Failed to remove admin status:', err);
-            toast.error('Failed to remove admin status');
+        } catch {
         }
     };
 
-    const handleDeleteUser = async (username: string) => {
+    const deleteUser = async (username: string) => {
         if (!confirm(`Delete user ${username}? This cannot be undone.`)) return;
         const jwt = getCookie("jwt");
         try {
             await deleteUser(username);
-            toast.success(`User ${username} deleted successfully`);
             fetchUsers();
-        } catch (err: any) {
-            console.error('Failed to delete user:', err);
-            toast.error('Failed to delete user');
+        } catch {
         }
     };
 
@@ -300,15 +296,9 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
                                     <div className="space-y-2">
                                         <Label htmlFor="scopes">Scopes</Label>
                                         <Input id="scopes" value={oidcConfig.scopes}
-                                               onChange={(e) => handleOIDCConfigChange('scopes', e.target.value)}
+                                               onChange={(e) => handleOIDCConfigChange('scopes', (e.target as HTMLInputElement).value)}
                                                placeholder="openid email profile" required/>
                                     </div>
-                                    <div className="space-y-2">
-                                        <Label htmlFor="userinfo_url">Overide User Info URL (not required)</Label>
-                                        <Input id="userinfo_url" value={oidcConfig.userinfo_url}
-                                               onChange={(e) => handleOIDCConfigChange('userinfo_url', e.target.value)}
-                                               placeholder="https://your-provider.com/application/o/userinfo/"/>
-                                    </div>
                                     <div className="flex gap-2 pt-2">
                                         <Button type="submit" className="flex-1"
                                                 disabled={oidcLoading}>{oidcLoading ? "Saving..." : "Save Configuration"}</Button>
@@ -320,10 +310,16 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
                                             token_url: '',
                                             identifier_path: 'sub',
                                             name_path: 'name',
-                                            scopes: 'openid email profile',
-                                            userinfo_url: ''
+                                            scopes: 'openid email profile'
                                         })}>Reset</Button>
                                     </div>
+
+                                    {oidcSuccess && (
+                                        <Alert>
+                                            <AlertTitle>Success</AlertTitle>
+                                            <AlertDescription>{oidcSuccess}</AlertDescription>
+                                        </Alert>
+                                    )}
                                 </form>
                             </div>
                         </TabsContent>
@@ -361,7 +357,7 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
                                                             className="px-4">{user.is_oidc ? "External" : "Local"}</TableCell>
                                                         <TableCell className="px-4">
                                                             <Button variant="ghost" size="sm"
-                                                                    onClick={() => handleDeleteUser(user.username)}
+                                                                    onClick={() => deleteUser(user.username)}
                                                                     className="text-red-600 hover:text-red-700 hover:bg-red-50"
                                                                     disabled={user.is_admin}>
                                                                 <Trash2 className="h-4 w-4"/>
@@ -381,7 +377,7 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
                                 <h3 className="text-lg font-semibold">Admin Management</h3>
                                 <div className="space-y-4 p-6 border rounded-md bg-muted/50">
                                     <h4 className="font-medium">Make User Admin</h4>
-                                    <form onSubmit={handleMakeUserAdmin} className="space-y-4">
+                                    <form onSubmit={makeUserAdmin} className="space-y-4">
                                         <div className="space-y-2">
                                             <Label htmlFor="new-admin-username">Username</Label>
                                             <div className="flex gap-2">
@@ -398,7 +394,12 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
                                                 <AlertDescription>{makeAdminError}</AlertDescription>
                                             </Alert>
                                         )}
-
+                                        {makeAdminSuccess && (
+                                            <Alert>
+                                                <AlertTitle>Success</AlertTitle>
+                                                <AlertDescription>{makeAdminSuccess}</AlertDescription>
+                                            </Alert>
+                                        )}
                                     </form>
                                 </div>
 
@@ -425,7 +426,7 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
                                                             className="px-4">{admin.is_oidc ? "External" : "Local"}</TableCell>
                                                         <TableCell className="px-4">
                                                             <Button variant="ghost" size="sm"
-                                                                    onClick={() => handleRemoveAdminStatus(admin.username)}
+                                                                    onClick={() => removeAdminStatus(admin.username)}
                                                                     className="text-orange-600 hover:text-orange-700 hover:bg-orange-50">
                                                                 <Shield className="h-4 w-4"/>
                                                                 Remove Admin
diff --git a/src/ui/Apps/Host Manager/HostManagerHostEditor.tsx b/src/ui/Apps/Host Manager/HostManagerHostEditor.tsx
index 7dc84072..e4e4ccd1 100644
--- a/src/ui/Apps/Host Manager/HostManagerHostEditor.tsx	
+++ b/src/ui/Apps/Host Manager/HostManagerHostEditor.tsx	
@@ -19,6 +19,7 @@ import {Tabs, TabsContent, TabsList, TabsTrigger} from "@/components/ui/tabs.tsx
 import React, {useEffect, useRef, useState} from "react";
 import {Switch} from "@/components/ui/switch.tsx";
 import {Alert, AlertDescription} from "@/components/ui/alert.tsx";
+import {toast} from "sonner";
 import {createSSHHost, updateSSHHost, getSSHHosts} from '@/ui/main-axios.ts';
 
 interface SSHHost {
@@ -244,8 +245,10 @@ export function HostManagerHostEditor({editingHost, onFormSubmit}: SSHManagerHos
 
             if (editingHost) {
                 await updateSSHHost(editingHost.id, formData);
+                toast.success(`Host "${formData.name}" updated successfully!`);
             } else {
                 await createSSHHost(formData);
+                toast.success(`Host "${formData.name}" added successfully!`);
             }
 
             if (onFormSubmit) {
@@ -254,7 +257,7 @@ export function HostManagerHostEditor({editingHost, onFormSubmit}: SSHManagerHos
 
             window.dispatchEvent(new CustomEvent('ssh-hosts:changed'));
         } catch (error) {
-            alert('Failed to save host. Please try again.');
+            toast.error('Failed to save host. Please try again.');
         }
     };
 
diff --git a/src/ui/Apps/Host Manager/HostManagerHostViewer.tsx b/src/ui/Apps/Host Manager/HostManagerHostViewer.tsx
index 476eb895..61942489 100644
--- a/src/ui/Apps/Host Manager/HostManagerHostViewer.tsx	
+++ b/src/ui/Apps/Host Manager/HostManagerHostViewer.tsx	
@@ -7,6 +7,7 @@ import {Input} from "@/components/ui/input";
 import {Accordion, AccordionContent, AccordionItem, AccordionTrigger} from "@/components/ui/accordion";
 import {Tooltip, TooltipContent, TooltipProvider, TooltipTrigger} from "@/components/ui/tooltip";
 import {getSSHHosts, deleteSSHHost, bulkImportSSHHosts} from "@/ui/main-axios.ts";
+import {toast} from "sonner";
 import {
     Edit,
     Trash2,
@@ -74,10 +75,11 @@ export function HostManagerHostViewer({onEditHost}: SSHManagerHostViewerProps) {
         if (window.confirm(`Are you sure you want to delete "${hostName}"?`)) {
             try {
                 await deleteSSHHost(hostId);
+                toast.success(`Host "${hostName}" deleted successfully!`);
                 await fetchHosts();
                 window.dispatchEvent(new CustomEvent('ssh-hosts:changed'));
             } catch (err) {
-                alert('Failed to delete host');
+                toast.error('Failed to delete host');
             }
         }
     };
@@ -114,16 +116,19 @@ export function HostManagerHostViewer({onEditHost}: SSHManagerHostViewerProps) {
             const result = await bulkImportSSHHosts(hostsArray);
 
             if (result.success > 0) {
-                alert(`Import completed: ${result.success} successful, ${result.failed} failed${result.errors.length > 0 ? '\n\nErrors:\n' + result.errors.join('\n') : ''}`);
+                toast.success(`Import completed: ${result.success} hosts imported successfully${result.failed > 0 ? `, ${result.failed} failed` : ''}`);
+                if (result.errors.length > 0) {
+                    toast.error(`Import errors: ${result.errors.join(', ')}`);
+                }
                 await fetchHosts();
                 window.dispatchEvent(new CustomEvent('ssh-hosts:changed'));
             } else {
-                alert(`Import failed: ${result.errors.join('\n')}`);
+                toast.error(`Import failed: ${result.errors.join(', ')}`);
             }
 
         } catch (err) {
             const errorMessage = err instanceof Error ? err.message : 'Failed to import JSON file';
-            alert(`Import error: ${errorMessage}`);
+            toast.error(`Import error: ${errorMessage}`);
         } finally {
             setImporting(false);
             event.target.value = '';
diff --git a/src/ui/Navigation/LeftSidebar.tsx b/src/ui/Navigation/LeftSidebar.tsx
index 9ddcec72..9c769e95 100644
--- a/src/ui/Navigation/LeftSidebar.tsx
+++ b/src/ui/Navigation/LeftSidebar.tsx
@@ -355,7 +355,7 @@ export function LeftSidebar({
         }
     };
 
-    const makeUserAdmin = async (e: React.FormEvent) => {
+    const handleMakeUserAdmin = async (e: React.FormEvent) => {
         e.preventDefault();
         if (!newAdminUsername.trim()) return;
 
@@ -380,7 +380,7 @@ export function LeftSidebar({
         }
     };
 
-    const removeAdminStatus = async (username: string) => {
+    const handleRemoveAdminStatus = async (username: string) => {
         if (!confirm(`Are you sure you want to remove admin status from ${username}?`)) return;
 
         if (!isAdmin) {
@@ -392,10 +392,11 @@ export function LeftSidebar({
             await removeAdminStatus(username);
             fetchUsers();
         } catch (err: any) {
+            console.error('Failed to remove admin status:', err);
         }
     };
 
-    const deleteUser = async (username: string) => {
+    const handleDeleteUser = async (username: string) => {
         if (!confirm(`Are you sure you want to delete user ${username}? This action cannot be undone.`)) return;
 
         if (!isAdmin) {
@@ -407,6 +408,7 @@ export function LeftSidebar({
             await deleteUser(username);
             fetchUsers();
         } catch (err: any) {
+            console.error('Failed to delete user:', err);
         }
     };
 
diff --git a/src/ui/User/PasswordReset.tsx b/src/ui/User/PasswordReset.tsx
index 19fb4724..df8b8db1 100644
--- a/src/ui/User/PasswordReset.tsx
+++ b/src/ui/User/PasswordReset.tsx
@@ -6,6 +6,7 @@ import {Label} from "@/components/ui/label.tsx";
 import {Input} from "@/components/ui/input.tsx";
 import {Button} from "@/components/ui/button.tsx";
 import {Alert, AlertDescription, AlertTitle} from "@/components/ui/alert.tsx";
+import {toast} from "sonner";
 
 interface PasswordResetProps {
     userInfo: {
@@ -25,7 +26,6 @@ export function PasswordReset({userInfo}: PasswordResetProps) {
     const [confirmPassword, setConfirmPassword] = useState("");
     const [tempToken, setTempToken] = useState("");
     const [resetLoading, setResetLoading] = useState(false);
-    const [resetSuccess, setResetSuccess] = useState(false);
 
     async function handleInitiatePasswordReset() {
         setError(null);
@@ -48,7 +48,6 @@ export function PasswordReset({userInfo}: PasswordResetProps) {
         setConfirmPassword("");
         setTempToken("");
         setError(null);
-        setResetSuccess(false);
     }
 
     async function handleVerifyResetCode() {
@@ -85,14 +84,8 @@ export function PasswordReset({userInfo}: PasswordResetProps) {
         try {
             await completePasswordReset(userInfo.username, tempToken, newPassword);
 
-            setResetStep("initiate");
-            setResetCode("");
-            setNewPassword("");
-            setConfirmPassword("");
-            setTempToken("");
-            setError(null);
-
-            setResetSuccess(true);
+            toast.success("Password reset successfully! You can now log in with your new password.");
+            resetPasswordState();
         } catch (err: any) {
             setError(err?.response?.data?.error || "Failed to complete password reset");
         } finally {
@@ -120,7 +113,7 @@ export function PasswordReset({userInfo}: PasswordResetProps) {
             </CardHeader>
             <CardContent>
                 <>
-                    {resetStep === "initiate" && !resetSuccess && (
+                    {resetStep === "initiate" && (
                         <>
                             <div className="flex flex-col gap-4">
                                 <Button
@@ -180,19 +173,7 @@ export function PasswordReset({userInfo}: PasswordResetProps) {
                         </>
                     )}
 
-                    {resetSuccess && (
-                        <>
-                            <Alert className="">
-                                <AlertTitle>Success!</AlertTitle>
-                                <AlertDescription>
-                                    Your password has been successfully reset! You can now log in
-                                    with your new password.
-                                </AlertDescription>
-                            </Alert>
-                        </>
-                    )}
-
-                    {resetStep === "newPassword" && !resetSuccess && (
+                    {resetStep === "newPassword" && (
                         <>
                             <div className="text-center text-muted-foreground mb-4">
                                 <p>Enter your new password for