diff --git a/src/components/DocumentList.tsx b/src/components/DocumentList.tsx
index cff2478..b67991b 100644
--- a/src/components/DocumentList.tsx
+++ b/src/components/DocumentList.tsx
@@ -42,6 +42,8 @@ const generateDefaultFolderName = (doc1: DocumentListDocument, doc2: DocumentLis
     // Use the first common word that's at least 3 characters long
     const significant = commonWords.find(word => word.length >= 3);
     if (significant) {
+      if (significant === 'pdf') return 'PDFs';
+      if (significant === 'epub') return 'EPUBs';
       return `${significant.charAt(0).toUpperCase()}${significant.slice(1)}`;
     }
   }
@@ -61,7 +63,7 @@ export function DocumentList() {
     isEPUBLoading,
   } = useDocuments();
 
-  const [sortBy, setSortBy] = useState<SortBy>('date');
+  const [sortBy, setSortBy] = useState<SortBy>('name');
   const [sortDirection, setSortDirection] = useState<SortDirection>('desc');
   const [folders, setFolders] = useState<Folder[]>([]);
   const [documentToDelete, setDocumentToDelete] = useState<DocumentToDelete | null>(null);
@@ -71,6 +73,7 @@ export function DocumentList() {
   const [pendingFolderDocs, setPendingFolderDocs] = useState<{ source: DocumentListDocument, target: DocumentListDocument } | null>(null);
   const [collapsedFolders, setCollapsedFolders] = useState<Set<string>>(new Set());
   const [isInitialized, setIsInitialized] = useState(false);
+  const [showHint, setShowHint] = useState(true);
 
   useEffect(() => {
     // Load saved state
@@ -81,6 +84,7 @@ export function DocumentList() {
         setSortDirection(savedState.sortDirection);
         setFolders(savedState.folders);
         setCollapsedFolders(new Set(savedState.collapsedFolders));
+        setShowHint(savedState.showHint ?? true); // Use saved hint state or default to true
       }
       setIsInitialized(true);
     };
@@ -94,7 +98,8 @@ export function DocumentList() {
         sortBy,
         sortDirection,
         folders,
-        collapsedFolders: Array.from(collapsedFolders)
+        collapsedFolders: Array.from(collapsedFolders),
+        showHint
       };
       await saveDocumentListState(state);
     };
@@ -102,7 +107,7 @@ export function DocumentList() {
     if (isInitialized) { // Prevents saving empty state on first render or back navigation
       saveState();
     }
-  }, [sortBy, sortDirection, folders, collapsedFolders]);
+  }, [sortBy, sortDirection, folders, collapsedFolders, showHint, isInitialized]);
 
   const allDocuments: DocumentListDocument[] = [
     ...pdfDocs.map(doc => ({
@@ -214,6 +219,7 @@ export function DocumentList() {
     setNewFolderName('');
     setDropTargetDoc(null);
     setDraggedDoc(null);
+    setShowHint(false);
   }, [pendingFolderDocs, newFolderName]);
 
   const handleFolderNameKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
@@ -443,6 +449,21 @@ export function DocumentList() {
         </div>
 
         <div className="space-y-4">
+          {showHint && allDocuments.length > 1 && (
+            <div className="flex items-center justify-between bg-offbase rounded-lg px-3 py-2 text-sm">
+              <p className="text-sm">Drag files on top of each other to make folders</p>
+              <Button
+                onClick={() => setShowHint(false)}
+                className="p-1 hover:bg-accent rounded-lg transition-colors"
+                aria-label="Dismiss hint"
+              >
+                <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                  <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M6 18L18 6M6 6l12 12" />
+                </svg>
+              </Button>
+            </div>
+          )}
+
           {folders.map(renderFolder)}
 
           <div className="space-y-2">
diff --git a/src/components/SettingsModal.tsx b/src/components/SettingsModal.tsx
index 28a58ab..a4784ac 100644
--- a/src/components/SettingsModal.tsx
+++ b/src/components/SettingsModal.tsx
@@ -197,17 +197,6 @@ export function SettingsModal({ isOpen, setIsOpen }: SettingsModalProps) {
                       {isDev && <div className="space-y-2">
                         <label className="block text-sm font-medium text-foreground">Document Sync</label>
                         <div className="flex gap-2">
-                          <Button
-                            onClick={handleSync}
-                            disabled={isSyncing || isLoading}
-                            className="justify-center rounded-lg bg-background px-3 py-1.5 text-sm 
-                                         font-medium text-foreground hover:bg-background/90 focus:outline-none 
-                                         focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-2
-                                         transform transition-transform duration-200 ease-in-out hover:scale-[1.04] hover:text-accent
-                                         disabled:opacity-50"
-                          >
-                            {isSyncing ? 'Saving...' : 'Save to Server'}
-                          </Button>
                           <Button
                             onClick={handleLoad}
                             disabled={isSyncing || isLoading}
@@ -217,13 +206,24 @@ export function SettingsModal({ isOpen, setIsOpen }: SettingsModalProps) {
                                          transform transition-transform duration-200 ease-in-out hover:scale-[1.04] hover:text-accent
                                          disabled:opacity-50"
                           >
-                            {isLoading ? 'Loading...' : 'Load from Server'}
+                            {isLoading ? 'Loading...' : 'Load docs from Server'}
+                          </Button>
+                          <Button
+                            onClick={handleSync}
+                            disabled={isSyncing || isLoading}
+                            className="justify-center rounded-lg bg-background px-3 py-1.5 text-sm 
+                                         font-medium text-foreground hover:bg-background/90 focus:outline-none 
+                                         focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-2
+                                         transform transition-transform duration-200 ease-in-out hover:scale-[1.04] hover:text-accent
+                                         disabled:opacity-50"
+                          >
+                            {isSyncing ? 'Saving...' : 'Save local to Server'}
                           </Button>
                         </div>
                       </div>}
 
                       <div className="space-y-2">
-                        <label className="block text-sm font-medium text-foreground">Delete Documents</label>
+                        <label className="block text-sm font-medium text-foreground">Bulk Delete</label>
                         <div className="flex gap-2">
                           <Button
                             onClick={() => setShowClearLocalConfirm(true)}
diff --git a/src/types/documents.ts b/src/types/documents.ts
index 7c3efed..5097115 100644
--- a/src/types/documents.ts
+++ b/src/types/documents.ts
@@ -37,4 +37,5 @@ export interface DocumentListState {
   sortDirection: SortDirection;
   folders: Folder[];
   collapsedFolders: string[];
+  showHint: boolean;
 }