diff --git a/app/[locale]/dashboard/[entityType]/[entitySlug]/aimodels/page.tsx b/app/[locale]/dashboard/[entityType]/[entitySlug]/aimodels/page.tsx
index f8b2df18..5c3ab74d 100644
--- a/app/[locale]/dashboard/[entityType]/[entitySlug]/aimodels/page.tsx
+++ b/app/[locale]/dashboard/[entityType]/[entitySlug]/aimodels/page.tsx
@@ -258,6 +258,7 @@ export default function AIModelsPage({
         <Navigation
           setNavigationTab={setNavigationTab}
           options={navigationOptions}
+          currentValue={navigationTab ?? 'registered'}
         />
 
         {AllAIModels.data?.aiModels.length > 0 ? (
diff --git a/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/components/navigate-org-datasets.tsx b/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/components/navigate-org-datasets.tsx
index e8ea4a75..176df945 100644
--- a/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/components/navigate-org-datasets.tsx
+++ b/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/components/navigate-org-datasets.tsx
@@ -3,6 +3,7 @@ import { Tab, TabList, Tabs } from 'opub-ui';
 export const Navigation = ({
   setNavigationTab,
   options,
+  currentValue,
 }: {
   setNavigationTab: (url: string) => void;
   options: Array<{
@@ -10,14 +11,15 @@ export const Navigation = ({
     url: string;
     selected: boolean;
   }>;
+  currentValue?: string;
 }) => {
   const handleTabClick = (url: string) => {
     setNavigationTab(url);
   };
-
+  const initialValue = options.find((o) => o.selected)?.url ?? options[0]?.url ?? '';
   return (
     <div>
-      <Tabs defaultValue="drafts">
+      <Tabs defaultValue={currentValue ?? initialValue}>
         <TabList fitted border>
           {options.map((item, index) => (
             <Tab
diff --git a/components/RichTextEditor/RichTextEditor.tsx b/components/RichTextEditor/RichTextEditor.tsx
index a8969c74..a9020599 100644
--- a/components/RichTextEditor/RichTextEditor.tsx
+++ b/components/RichTextEditor/RichTextEditor.tsx
@@ -37,7 +37,7 @@ const RichTextEditor: React.FC<RichTextEditorProps> = ({
   );
 
   // Custom image handler to use URLs instead of base64
-  const imageHandler = function(this: any) {
+  const imageHandler = function (this: any) {
     const url = prompt('Enter image URL:');
     if (url) {
       const quill = this.quill;
@@ -53,21 +53,21 @@ const RichTextEditor: React.FC<RichTextEditorProps> = ({
       toolbar: readOnly
         ? false
         : {
-            container: [
-              [{ header: [1, 2, 3, false] }],
-              ['bold', 'italic', 'underline', 'strike'],
-              [{ list: 'ordered' }, { list: 'bullet' }],
-              [{ indent: '-1' }, { indent: '+1' }],
-              ['link', 'image'],
-              [{ align: [] }],
-              ['clean'],
-              ['preview'], // Custom preview button
-            ],
-            handlers: {
-              preview: () => setIsPreview(!isPreview),
-              image: imageHandler,
-            },
+          container: [
+            [{ header: [1, 2, 3, false] }],
+            ['bold', 'italic', 'underline', 'strike'],
+            [{ list: 'ordered' }, { list: 'bullet' }],
+            [{ indent: '-1' }, { indent: '+1' }],
+            ['link', 'image'],
+            [{ align: [] }],
+            ['clean'],
+            ['preview'], // Custom preview button
+          ],
+          handlers: {
+            preview: () => setIsPreview(!isPreview),
+            image: imageHandler,
           },
+        },
       clipboard: {
         matchVisual: false,
       },
@@ -96,7 +96,7 @@ const RichTextEditor: React.FC<RichTextEditorProps> = ({
           {label}
         </label>
       )}
-      
+
       {isPreview ? (
         <div className="min-h-[200px] rounded-md border border-gray-300 bg-white">
           <div className="flex items-center justify-between border-b border-gray-300 bg-gray-50 px-4 py-2">
@@ -137,7 +137,7 @@ const RichTextEditor: React.FC<RichTextEditorProps> = ({
           />
         </div>
       )}
-      
+
       {helpText && (
         <p className="mt-1 text-sm text-gray-500">{helpText}</p>
       )}
@@ -200,6 +200,9 @@ const RichTextEditor: React.FC<RichTextEditorProps> = ({
           align-items: center;
           gap: 4px;
         }
+        .rich-text-editor + p {
+          font-size: 12px;
+        }
         
         .preview-content {
           padding: 0;