diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ad90ad5..9e7d3989 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,28 @@
 # Changelog
 
+## [1.1.0-rc.21](https://github.com/NFDI4Chem/nmrxiv/compare/v1.0.0-rc.21...v1.1.0-rc.21) (2024-01-15)
+
+
+### Features
+
+* updated OA schema to include enum values ([8534f88](https://github.com/NFDI4Chem/nmrxiv/commit/8534f882205559ab8e224b5b677bcd59d17c8be2))
+
+
+### Bug Fixes
+
+* added is_null check to request photo to avoid 500 error ([be04a3e](https://github.com/NFDI4Chem/nmrxiv/commit/be04a3e993ada4c210d0fbc97e9f6934df119584))
+* enabled file select ([e1680fa](https://github.com/NFDI4Chem/nmrxiv/commit/e1680fa5e0fafeb83547da8fa24b245c4cf0d3b8))
+* enabled select files on click ([16397a3](https://github.com/NFDI4Chem/nmrxiv/commit/16397a3193e3cf89aea3d82ea9450f7e477a34f7))
+* Issues with default sort (disabled for now) ([574b4f3](https://github.com/NFDI4Chem/nmrxiv/commit/574b4f374df7439ed9a57112d88bdf0e5278d988))
+* published project policy issues fix ([f03801f](https://github.com/NFDI4Chem/nmrxiv/commit/f03801f6085e4ff88dc7d32e43fe1f83718a5743))
+* removed deleted word concatenation to project name upon deletion ([0776172](https://github.com/NFDI4Chem/nmrxiv/commit/0776172eb084b8539e7d402dda443819af4448b2))
+* resolve cooloff period value. ([201f6ff](https://github.com/NFDI4Chem/nmrxiv/commit/201f6ff017ac57b83aba20e02e75aceef83931e3)), closes [#1014](https://github.com/NFDI4Chem/nmrxiv/issues/1014)
+* resolved [#1018](https://github.com/NFDI4Chem/nmrxiv/issues/1018) ([677eb54](https://github.com/NFDI4Chem/nmrxiv/commit/677eb54f9ac48f0692b2b55f0f7424c4084387a8))
+* resolved permanent loading screen while navigation forward and backward between steps ([1447070](https://github.com/NFDI4Chem/nmrxiv/commit/14470702ecc728dc6062028d5eb67fdf14d7f804))
+* resolves [#1010](https://github.com/NFDI4Chem/nmrxiv/issues/1010) ([12a1363](https://github.com/NFDI4Chem/nmrxiv/commit/12a13630f5cbfd1587e204adc0ed2e10956f871d))
+* resolves [#996](https://github.com/NFDI4Chem/nmrxiv/issues/996) ([4471c3b](https://github.com/NFDI4Chem/nmrxiv/commit/4471c3b87f99053b08975bc4b2a26aaec1d1089a))
+* side bar layout changes ([a4b80f2](https://github.com/NFDI4Chem/nmrxiv/commit/a4b80f2098ec5869932ac71d2f89f02f9dabf453))
+
 ## [1.0.1-rc.20](https://github.com/NFDI4Chem/nmrxiv/compare/v1.0.0-rc.20...v1.0.1-rc.20) (2024-01-10)
 
 
diff --git a/app/Actions/Project/DeleteProject.php b/app/Actions/Project/DeleteProject.php
index ac8a9670..d4581293 100644
--- a/app/Actions/Project/DeleteProject.php
+++ b/app/Actions/Project/DeleteProject.php
@@ -37,7 +37,7 @@ public function delete($project)
             if ($draft) {
                 $draft->update(['is_deleted' => true]);
             }
-            $project->name = $project->name.'- deleted';
+            $project->name = $project->name;
             $project->deleted_on = Carbon::now();
             $project->is_deleted = true;
             $project->sendNotification('deletion', $this->prepareSendList($project));
diff --git a/app/Actions/Project/UpdateProject.php b/app/Actions/Project/UpdateProject.php
index ffdd99e1..7264901f 100644
--- a/app/Actions/Project/UpdateProject.php
+++ b/app/Actions/Project/UpdateProject.php
@@ -33,11 +33,12 @@ public function update(Project $project, array $input)
 
             if (array_key_exists('photo', $input)) {
                 $image = $input['photo'];
-                $s3 = Storage::disk(env('FILESYSTEM_DRIVER_PUBLIC'));
-                $file_name =
-                    uniqid().'.'.$image->getClientOriginalExtension();
-                $s3filePath = '/projects/'.$file_name;
-                $s3->put($s3filePath, file_get_contents($image), 'public');
+                if (! is_null($image)) {
+                    $s3 = Storage::disk(env('FILESYSTEM_DRIVER_PUBLIC'));
+                    $file_name = uniqid().'.'.$image->getClientOriginalExtension();
+                    $s3filePath = '/projects/'.$file_name;
+                    $s3->put($s3filePath, file_get_contents($image), 'public');
+                }
             }
 
             $is_public = array_key_exists('is_public', $input) ? $input['is_public'] : $project->is_public;
diff --git a/app/Http/Controllers/API/DataController.php b/app/Http/Controllers/API/DataController.php
index cf9926a0..7a2a50e9 100644
--- a/app/Http/Controllers/API/DataController.php
+++ b/app/Http/Controllers/API/DataController.php
@@ -18,7 +18,7 @@ class DataController extends Controller
      * @OA\Get(
      * path="/api/v1/list/{model}",
      * summary="Fetch all models",
-     * description="Fetch details for all publicly available models on nmrXiv.",
+     * description="Fetch details for all publicly available models (i.e. projects, samples, datasets) on nmrXiv.",
      * operationId="publicModels",
      * tags={"public"},
      *
@@ -30,7 +30,8 @@ class DataController extends Controller
      *
      *      @OA\Schema(
      *          type="string",
-     *    )
+     *          enum={"projects", "samples", "datasets"}
+     *      )
      * ),
      *
      * @OA\Response(
@@ -56,7 +57,6 @@ public function all(Request $request, $model)
                     ->where('is_public', true)
                     ->allowedSorts($allowedSorts)
                     ->allowedFilters($allowedFilters)
-                    ->defaultSort($defaultSort)
                     ->paginate($per_page)
                     ->appends(request()->query())
             );
@@ -66,7 +66,6 @@ public function all(Request $request, $model)
                     ->where('is_public', true)
                     ->allowedSorts($allowedSorts)
                     ->allowedFilters($allowedFilters)
-                    ->defaultSort($defaultSort)
                     ->paginate($per_page)
                     ->appends(request()->query())
             );
@@ -76,7 +75,6 @@ public function all(Request $request, $model)
                     ->where('is_public', true)
                     ->allowedSorts($allowedSorts)
                     ->allowedFilters($allowedFilters)
-                    ->defaultSort($defaultSort)
                     ->paginate($per_page)
                     ->appends(request()->query())
             );
diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php
index db3d115b..47bbca14 100644
--- a/app/Http/Controllers/DashboardController.php
+++ b/app/Http/Controllers/DashboardController.php
@@ -14,16 +14,22 @@ public function dashboard(Request $request)
         $user = $request->user();
         $team = $user->currentTeam;
         $projects = [];
+        $samples = [];
 
         if ($team) {
             $team->users = $team->allUsers();
             if (! $team->personal_team) {
                 $projects = Project::with('users', 'owner')->where([['team_id', $team->id], ['is_deleted', false]])->orderBy('updated_at', 'DESC')->get();
+                $samples = Study::with('users', 'owner', 'sample.molecules')->where([['project_id', null], ['team_id', $team->id], ['is_deleted', false]])->orderBy('updated_at', 'DESC')->get();
             } else {
                 $projects = Project::with('users', 'owner')->where([['owner_id', $user->id], ['is_deleted', false]])
                     ->where('team_id', $team->id)
                     ->orderBy('updated_at', 'DESC')
                     ->get();
+
+                $samples = Study::with('users', 'owner')->where([['project_id', null], ['owner_id', $user->id], ['is_deleted', false]])
+                    ->where('team_id', $team->id)
+                    ->orderBy('updated_at', 'DESC')->get();
             }
         }
 
@@ -31,6 +37,7 @@ public function dashboard(Request $request)
             'filters' => $request->all('action', 'draft_id'),
             'team' => $team,
             'projects' => $projects->load('tags'),
+            'samples' => $samples->load('sample.molecules'),
             'teamRole' => $user->teamRole($team),
         ]);
     }
diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php
index 0ddaac2c..3fa95c16 100644
--- a/app/Http/Controllers/ProjectController.php
+++ b/app/Http/Controllers/ProjectController.php
@@ -386,7 +386,7 @@ public function destroy(Request $request, StatefulGuard $guard, Project $project
             ]);
         }
 
-        if ($project->status = 'processing' || $project->status = 'queued') {
+        if ($project->status == 'processing' || $project->status == 'queued') {
             return redirect()->route('dashboard')->with('error', 'It is not possible to delete a project that is currently being processed or queued.');
         } else {
             $creator->delete($project);
diff --git a/app/Http/Middleware/HandleInertiaRequests.php b/app/Http/Middleware/HandleInertiaRequests.php
index b20628b4..e29f21ff 100644
--- a/app/Http/Middleware/HandleInertiaRequests.php
+++ b/app/Http/Middleware/HandleInertiaRequests.php
@@ -73,7 +73,7 @@ public function share(Request $request)
             'SCOUT_PREFIX' => (env('SCOUT_PREFIX')),
             'europemcWSApi' => (env('EUROPEMC_WS_API')),
             'dataciteURL' => env('DATACITE_ENDPOINT'),
-            'collOffPeriod' => env('COOL_OFF_PERIOD'),
+            'coolOffPeriod' => env('COOL_OFF_PERIOD'),
             'mailFromAddress' => env('MAIL_FROM_ADDRESS'),
             'orcidSearchApi' => env('ORCID_ID_SEARCH_API'),
             'orcidPersonApi' => env('ORCID_ID_PERSON_API'),
diff --git a/app/Policies/ProjectPolicy.php b/app/Policies/ProjectPolicy.php
index 57fda6b9..9bbd6fc3 100644
--- a/app/Policies/ProjectPolicy.php
+++ b/app/Policies/ProjectPolicy.php
@@ -65,7 +65,7 @@ public function createProject(User $user)
      */
     public function updateProject(User $user, Project $project)
     {
-        if ($project->is_public || $project->is_archived || $project->is_deleted || $project->is_published) {
+        if ($project->is_public || $project->is_archived || $project->is_deleted || $project->is_published || (! $project->is_published && $project->doi)) {
             return false;
         }
 
diff --git a/resources/js/Layouts/AppLayout.vue b/resources/js/Layouts/AppLayout.vue
index 51ef424a..8ad65115 100644
--- a/resources/js/Layouts/AppLayout.vue
+++ b/resources/js/Layouts/AppLayout.vue
@@ -131,25 +131,59 @@
                             aria-label="Sidebar"
                             class="flex flex-col items-center py-4 px-0"
                         >
-                            <Link
-                                v-for="item in filteredNavigation"
-                                :key="item.name"
-                                :href="item.href"
-                                :class="[
-                                    $page.url === item.href
-                                        ? ' border-r-4 bg-gray-200 border-r-black'
-                                        : '',
-                                    'w-full px-7 hover:bg-gray-700 hover:text-white group flex items-center py-3 text-sm font-medium ' +
-                                        item.bg,
-                                ]"
-                            >
-                                <component
-                                    :is="item.icon"
-                                    class="h-6 w-6"
-                                    aria-hidden="true"
-                                />
-                                <span class="sr-only"> {{ item.name }} </span>
-                            </Link>
+                            <div v-for="item in filteredNavigation">
+                                <div
+                                    v-if="!$page.props.user.first_name"
+                                    class="border-t"
+                                >
+                                    &nbsp;
+                                </div>
+                                <Link
+                                    :key="item.name"
+                                    :href="item.href"
+                                    v-if="item.name"
+                                    :class="[
+                                        $page.url === item.href
+                                            ? 'bg-gray-900 border-y text-white'
+                                            : 'bg-gray-200 border-y',
+                                        'w-full px-10 hover:bg-gray-700 hover:text-white group flex items-center py-4 text-md font-small ' +
+                                            item.bg,
+                                    ]"
+                                >
+                                    <component
+                                        :is="item.icon"
+                                        class="h-6 w-6"
+                                        aria-hidden="true"
+                                    />
+                                    <span class="sr-only">
+                                        {{ item.name }}
+                                    </span>
+                                </Link>
+                                <Link
+                                    v-for="child in item.children"
+                                    :id="child.id"
+                                    :key="child.name"
+                                    :href="child.href"
+                                    :class="[
+                                        $page.url === child.href
+                                            ? 'bg-gray-900 text-white'
+                                            : '',
+                                        'w-full px-10 hover:bg-gray-700 hover:text-white group flex items-center py-3 text-md font-small ' +
+                                            child.bg,
+                                    ]"
+                                >
+                                    <component
+                                        :is="child.icon"
+                                        class="h-6 w-6"
+                                        aria-hidden="true"
+                                    />
+                                    <span class="flex-1 sr-only">
+                                        {{ child.name }}
+                                    </span>
+                                </Link>
+                                <div class="border-b">&nbsp;</div>
+                                <div>&nbsp;</div>
+                            </div>
                         </nav>
                     </div>
                     <div class="flex-shrink-0 flex pb-5"></div>
@@ -195,22 +229,23 @@
                         <div
                             v-for="item in filteredNavigation"
                             :key="item.name"
-                            :class="[item.auth ? 'border-t' : '']"
+                            :class="[item.auth ? 'border-t pb-4' : '']"
                         >
                             <div
                                 v-if="item.prefix"
-                                class="p-2 bg-gray-100 text-gray-500 text-sm border-b"
+                                class="p-2 bg-gray-100 text-gray-500 text-sm border-y"
                             >
                                 {{ item.prefix }}
                             </div>
                             <Link
                                 :id="item.id"
                                 :href="item.href"
+                                v-if="item.name"
                                 :class="[
                                     $page.url === item.href
                                         ? ' border-r-4 bg-gray-200 border-r-black'
                                         : '',
-                                    'w-full px-7 hover:bg-gray-700 hover:text-white group flex items-center py-3 text-sm font-medium ' +
+                                    'w-full px-7 hover:bg-gray-700 hover:text-white group flex items-center py-3 text-md font-medium ' +
                                         item.bg,
                                 ]"
                             >
@@ -230,13 +265,13 @@
                                     $page.url === child.href
                                         ? ' border-r-4 bg-gray-200 border-r-black'
                                         : '',
-                                    'w-full px-10 hover:bg-gray-700 hover:text-white group flex items-center py-1.5 text-sm font-small ' +
+                                    'w-full px-10 hover:bg-gray-700 hover:text-white group flex items-center py-1.5 text-md font-small ' +
                                         child.bg,
                                 ]"
                             >
                                 <component
                                     :is="child.icon"
-                                    class="mr-3 ml-2 h-4 w-4"
+                                    class="mr-3 ml-2 h-5 w-5"
                                     aria-hidden="true"
                                 />
                                 <span class="flex-1"> {{ child.name }} </span>
@@ -489,19 +524,11 @@
                                         "
                                     >
                                         <div
-                                            v-if="
-                                                !$page.props.user.current_team
-                                                    .personal_team
-                                            "
                                             class="block px-4 pt-2 text-xs text-gray-400"
                                         >
                                             Personal Account
                                         </div>
                                         <form
-                                            v-if="
-                                                !$page.props.user.current_team
-                                                    .personal_team
-                                            "
                                             @submit.prevent="
                                                 switchToTeam(personalTeam)
                                             "
@@ -509,6 +536,25 @@
                                             <jet-dropdown-link as="button">
                                                 <div class="flex items-center">
                                                     <svg
+                                                        v-if="
+                                                            $page.props.user
+                                                                .current_team
+                                                                .personal_team
+                                                        "
+                                                        class="mr-2 h-5 w-5 text-green-400"
+                                                        fill="none"
+                                                        stroke-linecap="round"
+                                                        stroke-linejoin="round"
+                                                        stroke-width="2"
+                                                        stroke="currentColor"
+                                                        viewBox="0 0 24 24"
+                                                    >
+                                                        <path
+                                                            d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"
+                                                        ></path>
+                                                    </svg>
+                                                    <svg
+                                                        v-else
                                                         class="mr-2 h-5 w-5 text-gray-400"
                                                         fill="none"
                                                         stroke-linecap="round"
@@ -521,6 +567,7 @@
                                                             d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"
                                                         ></path>
                                                     </svg>
+
                                                     <div>
                                                         {{
                                                             $page.props.user
@@ -739,27 +786,6 @@ const secondaryNavigation = [
 ];
 
 const navigation = [
-    {
-        auth: false,
-        name: "Projects",
-        href: "/projects",
-        icon: FolderIcon,
-        bg: "bg-white",
-    },
-    {
-        auth: false,
-        name: "Spectra",
-        href: "/spectra",
-        icon: Squares2X2Icon,
-        bg: "bg-white",
-    },
-    {
-        auth: false,
-        name: "Compounds",
-        href: "/compounds",
-        icon: SwatchIcon,
-        bg: "bg-white",
-    },
     {
         auth: true,
         name: "Dashboard",
@@ -803,6 +829,32 @@ const navigation = [
             },
         ],
     },
+    {
+        prefix: "Public",
+        children: [
+            {
+                auth: false,
+                name: "Projects",
+                href: "/projects",
+                icon: FolderIcon,
+                bg: "bg-white",
+            },
+            {
+                auth: false,
+                name: "Spectra",
+                href: "/spectra",
+                icon: Squares2X2Icon,
+                bg: "bg-white",
+            },
+            {
+                auth: false,
+                name: "Compounds",
+                href: "/compounds",
+                icon: SwatchIcon,
+                bg: "bg-white",
+            },
+        ],
+    },
 ];
 
 export default {
diff --git a/resources/js/Pages/Dashboard.vue b/resources/js/Pages/Dashboard.vue
index 68f65e65..bda6a09a 100644
--- a/resources/js/Pages/Dashboard.vue
+++ b/resources/js/Pages/Dashboard.vue
@@ -44,13 +44,73 @@
                 </div>
             </div>
         </template>
-        <div v-if="projects.length > 0" class="px-12 py-8 mx-auto max-w-4xl">
-            <team-projects
-                :team="team"
-                :team-role="teamRole"
-                :mode="'create'"
-                :projects="projects"
-            ></team-projects>
+        <div v-if="projects.length > 0" class="px-8 py-8 mx-auto max-w-4xl">
+            <div>
+                <div class="sm:hidden">
+                    <label for="tabs" class="sr-only">Select a tab</label>
+                    <!-- Use an "onChange" listener to redirect the user to the selected tab URL. -->
+                    <select
+                        id="tabs"
+                        name="tabs"
+                        class="block w-full rounded-md border-gray-300 focus:border-indigo-500 focus:ring-indigo-500"
+                    >
+                        <option
+                            :selected="selectedTab === 'projects'"
+                            value="projects"
+                        >
+                            Projects
+                        </option>
+                        <option
+                            :selected="selectedTab === 'samples'"
+                            value="samples"
+                        >
+                            Samples
+                        </option>
+                    </select>
+                </div>
+                <div class="hidden sm:block">
+                    <nav class="flex space-x-4" aria-label="Tabs">
+                        <!-- Current: "bg-indigo-100 text-indigo-700", Default: "text-gray-500 hover:text-gray-700" -->
+                        <a
+                            href="?tab=projects"
+                            :class="[
+                                selectedTab == 'projects'
+                                    ? 'bg-indigo-100 text-indigo-700'
+                                    : '',
+                                'rounded-md px-3 py-2 text-sm font-medium',
+                            ]"
+                            aria-current="page"
+                            >Projects</a
+                        >
+                        <a
+                            href="?tab=samples"
+                            :class="[
+                                selectedTab == 'samples'
+                                    ? 'bg-indigo-100 text-indigo-700'
+                                    : '',
+                                'rounded-md px-3 py-2 text-sm font-medium',
+                            ]"
+                            >Samples</a
+                        >
+                    </nav>
+                </div>
+            </div>
+            <div v-if="selectedTab == 'projects'">
+                <team-projects
+                    :team="team"
+                    :team-role="teamRole"
+                    :mode="'create'"
+                    :projects="projects"
+                ></team-projects>
+            </div>
+            <div v-if="selectedTab == 'samples'">
+                <team-samples
+                    :team="team"
+                    :team-role="teamRole"
+                    :mode="'create'"
+                    :studies="samples"
+                ></team-samples>
+            </div>
         </div>
         <div v-else>
             <div class="max-w-lg my-6 py-6 mx-auto">
@@ -296,6 +356,7 @@
 <script>
 import AppLayout from "@/Layouts/AppLayout.vue";
 import TeamProjects from "@/Pages/Project/Index.vue";
+import TeamSamples from "@/Shared/Samples.vue";
 import Create from "@/Shared/CreateButton.vue";
 import Onboarding from "@/App/Onboarding.vue";
 import { useMagicKeys } from "@vueuse/core";
@@ -311,11 +372,17 @@ export default {
         AppLayout,
         computed,
         TeamProjects,
+        TeamSamples,
         Create,
         Onboarding,
         Link,
     },
-    props: ["user", "team", "projects", "teamRole", "filters"],
+    data() {
+        return {
+            selectedTab: "projects",
+        };
+    },
+    props: ["user", "team", "projects", "samples", "teamRole", "filters"],
     setup() {
         const app = getCurrentInstance();
         const openDatasetCreateDialog = (data) => {
@@ -353,6 +420,10 @@ export default {
                 draft_id: this.filters.draft_id,
             });
         }
+
+        const urlSearchParams = new URLSearchParams(window.location.search);
+        const params = Object.fromEntries(urlSearchParams.entries());
+        this.selectedTab = params["tab"] ? params["tab"] : "projects";
     },
 };
 </script>
diff --git a/resources/js/Pages/Project/Index.vue b/resources/js/Pages/Project/Index.vue
index 2fe740e1..58a16556 100644
--- a/resources/js/Pages/Project/Index.vue
+++ b/resources/js/Pages/Project/Index.vue
@@ -1,13 +1,13 @@
 <template>
     <div>
-        <div class="flex items-baseline justify-between">
+        <!-- <div class="flex items-baseline justify-between">
             <div id="tour-step-projects">
                 <h2 class="text-lg">Projects</h2>
-                <!-- <div class="mt-2 text-sm text-gray-700"> -->
-                <!-- <div class="max-w-2xl">You may house a variety of projects.</div> -->
-                <!-- </div> -->
+                <div class="mt-2 text-sm text-gray-700">
+                <div class="max-w-2xl">You may house a variety of projects.</div>
+                </div>
             </div>
-        </div>
+        </div> -->
         <span v-if="projects.length <= 0">
             <div v-if="mode == 'create' && editableTeamRole" class="mt-4">
                 <div class="px-6 py-4 bg-white shadow-md rounded-lg">
@@ -368,7 +368,7 @@
                             "
                             class="float mt-1 border-t px-3 py-0.5 -mx-6 mt-4 text-sm font-medium bg-yellow-100 text-red-800 capitalize"
                         >
-                            PUBLISHED -&emsp;
+                            &nbsp;&nbsp;
                             <b
                                 >Release date:
                                 {{ formatDate(project.release_date) }}</b
diff --git a/resources/js/Pages/Project/Show.vue b/resources/js/Pages/Project/Show.vue
index 9ea3d6f9..a38fb10d 100644
--- a/resources/js/Pages/Project/Show.vue
+++ b/resources/js/Pages/Project/Show.vue
@@ -11,13 +11,14 @@
                 restore a deleted project within the 30-day recovery period.
             </div>
             <div
-                v-if="!project.is_public && project.is_published"
+                v-if="
+                    !project.is_public && !project.is_published && project.doi
+                "
                 class="text-center px-3 py-2 bg-green-50 text-green-700 border-b"
             >
-                <b>Info: </b> This project is published and set to be released
-                on {{ formatDate(project.release_date) }}. You cannot edit a
-                published project, please create a new version to updated the
-                project.
+                <b>Info: </b> This project is in embargo and set to be released
+                on {{ formatDate(project.release_date) }}. You cannot edit the
+                project, please create a new version to updated the project.
             </div>
             <div v-if="project.is_public">
                 <div
@@ -31,9 +32,9 @@
                     v-else
                     class="text-center px-3 py-2 bg-green-50 text-green-700 border-b"
                 >
-                    <b>Info: </b> This project is published. You cannot edit a
-                    published project, please create a new version to updated
-                    the project.
+                    <b>Info: </b> This project is archived. You cannot edit a
+                    archived project, please create a new version to updated the
+                    project.
                 </div>
             </div>
             <div v-if="project.is_public && project.doi != null">
@@ -325,17 +326,23 @@
                             v-if="
                                 !project.is_public &&
                                 !project.is_published &&
-                                !project.is_deleted
+                                !project.is_deleted &&
+                                !project.doi
                             "
                             class="flex-nowrap"
                         >
                             <Publish :project="project" />
                         </div>
-                        <div v-if="!project.is_public && project.is_published">
+                        <div
+                            v-if="
+                                !project.is_public &&
+                                !project.is_published &&
+                                project.doi
+                            "
+                        >
                             <span
-                                class="ml-4 inline-flex items-center px-3 py-0.5 rounded-full text-sm font-medium bg-yellow-100 text-red-800 capitalize"
+                                class="ml-4 py-2 inline-flex items-center px-3 rounded-md text-sm font-medium bg-yellow-100 text-red-800 capitalize"
                             >
-                                PUBLISHED -&emsp;
                                 <b
                                     >Release date:
                                     {{ formatDate(project.release_date) }}</b
diff --git a/resources/js/Pages/Upload.vue b/resources/js/Pages/Upload.vue
index 79a4b1fb..11e33524 100644
--- a/resources/js/Pages/Upload.vue
+++ b/resources/js/Pages/Upload.vue
@@ -975,6 +975,7 @@
                                                 </div>
                                                 <div v-else>
                                                     <div
+                                                        v-if="selectedStudy"
                                                         class="mx-auto flex flex-col md:px-0 xl:px-0"
                                                     >
                                                         <div>
@@ -2035,12 +2036,15 @@ export default {
             });
             if (id == 1) {
                 // this.loadingStep = true;
+                this.selectedStudyIndex = null;
+                this.selectedStudy = null;
                 this.$nextTick(function () {
                     this.setQueryStringParameter(
                         "draft_id",
                         this.currentDraft.id
                     );
                     this.setQueryStringParameter("step", 1);
+                    this.setQueryStringParameter("sample", null);
                     this.step = "1";
                     if (this.$refs.fsbRef) {
                         this.$refs.fsbRef.annotate();
@@ -2053,15 +2057,6 @@ export default {
                     // }
                     this.setQueryStringParameter("step", 2);
                     this.step = "2";
-                    if (this.querySample) {
-                        let i = 0;
-                        this.studies.forEach((s) => {
-                            if (s.id == this.querySample) {
-                                this.selectStudy(s, i);
-                            }
-                            i = i + 1;
-                        });
-                    }
                     this.fetchValidations();
                     this.updateAutoImportList();
                 });
@@ -2152,6 +2147,19 @@ export default {
                     ) {
                         this.loadingStep = false;
                         this.selectStep(2);
+                        this.$nextTick(() => {
+                            if (this.querySample) {
+                                let i = 0;
+                                this.studies.forEach((s) => {
+                                    if (s.id == this.querySample) {
+                                        this.selectStudy(s, i);
+                                    }
+                                    i = i + 1;
+                                });
+                            } else {
+                                this.showSamplesSummary();
+                            }
+                        });
                         this.inprogressStudies = this.studies.filter(
                             (study) => study.internal_status != "complete"
                         );
diff --git a/resources/js/Shared/DOIBadge.vue b/resources/js/Shared/DOIBadge.vue
index 10e84826..5422ed76 100644
--- a/resources/js/Shared/DOIBadge.vue
+++ b/resources/js/Shared/DOIBadge.vue
@@ -49,7 +49,10 @@ export default {
                 setTimeout(() => {
                     this.isVisible = false;
                 }, 2500);
-                this.copyToClipboard(this.doi, targetInput);
+                this.copyToClipboard(
+                    "https://doi.org/" + this.doi,
+                    targetInput
+                );
             }
         },
     },
diff --git a/resources/js/Shared/FileSystemBrowser.vue b/resources/js/Shared/FileSystemBrowser.vue
index 7fdba54c..5226bf02 100644
--- a/resources/js/Shared/FileSystemBrowser.vue
+++ b/resources/js/Shared/FileSystemBrowser.vue
@@ -112,7 +112,7 @@
                 v-if="!readonly"
                 :class="[fullScreen ? 'px-6 py-4' : 'px-5', '']"
             >
-                <form class="py-2 mb-3">
+                <div class="py-2 mb-3">
                     <div id="fs-dropzone-message" class="text-center">
                         <div
                             type="button"
@@ -136,7 +136,7 @@
                             <span
                                 class="mt-2 block text-lg font-bold text-blue-600"
                             >
-                                Drop Files or Folders to upload
+                                Drop Files or Folders
                                 <span
                                     v-if="
                                         $page.props.selectedFolder &&
@@ -145,6 +145,23 @@
                                 >
                                     to "{{ $page.props.selectedFolder }}" folder
                                 </span>
+                                <form
+                                    class="inline"
+                                    enctype="multipart/form-data"
+                                >
+                                    or
+                                    <button
+                                        type="button"
+                                        class="bg-transparent hover:bg-blue-500 text-blue-700 font-semibold hover:text-white px-2 border border-blue-500 hover:border-transparent rounded"
+                                        id="fs-dropzone-click-target"
+                                    >
+                                        Select folders
+                                    </button>
+                                    to upload
+                                    <div
+                                        id="fs-dropzone-hidden-input-container"
+                                    ></div>
+                                </form>
                                 <div class="text-sm text-gray-400">
                                     Need help? Check out our
                                     <a
@@ -199,7 +216,7 @@
                             </div>
                         </div>
                     </div>
-                </form>
+                </div>
             </div>
             <div v-if="loading">
                 <div class="h-[calc(100vh-260px)] text-center py-12">
@@ -903,8 +920,11 @@ export default {
                     uploadMultiple: true,
                     disablePreviews: true,
                     parallelUploads: 100,
+                    useFsAccessApi: false,
                     autoQueue: false,
                     maxFiles: 20000,
+                    clickable: "#fs-dropzone-click-target",
+                    hiddenInputContainer: "#fs-dropzone-hidden-input-container",
                     dictDefaultMessage: document.querySelector(
                         "#fs-dropzone-message"
                     ).innerHTML,
@@ -913,6 +933,10 @@ export default {
                     },
                 };
                 vm.dropzone = new Dropzone("#fs-dropzone", options);
+                vm.dropzone.hiddenFileInput.setAttribute(
+                    "webkitdirectory",
+                    true
+                );
                 vm.dropzone.on("processing", (file) => {
                     vm.dropzone.options.url = file.uploadURL;
                     vm.status = "UPLOAD IN PROGRESS";
@@ -942,18 +966,24 @@ export default {
                     }
                 });
                 vm.dropzone.on("addedfile", (file) => {
-                    vm.selectedFSO.push(file);
                     if (file.fullPath) {
                         vm.logs[file.fullPath] = {
                             status: "Queued",
                             messages: [],
                         };
+                    } else if (file.webkitRelativePath) {
+                        file.fullPath = file.webkitRelativePath;
+                        vm.logs[file.webkitRelativePath] = {
+                            status: "Queued",
+                            messages: [],
+                        };
                     } else {
                         vm.logs[file.name] = {
                             status: "Queued",
                             messages: [],
                         };
                     }
+                    vm.selectedFSO.push(file);
                 });
                 vm.dropzone.on("addedfiles", (files) => {
                     if (files.length > 0) {
diff --git a/resources/js/Shared/Samples.vue b/resources/js/Shared/Samples.vue
new file mode 100644
index 00000000..3fba5dba
--- /dev/null
+++ b/resources/js/Shared/Samples.vue
@@ -0,0 +1,101 @@
+<template>
+    <div>
+        <div v-if="!loading && studies">
+            <div v-if="studies.length > 0">
+                <div
+                    class="mt-8 mx-auto max-w-md grid gap-8 sm:max-w-lg lg:grid-cols-3 lg:max-w-7xl"
+                >
+                    <div v-for="study in studies" :key="study.uuid">
+                        <study-card :study="study" />
+                    </div>
+                </div>
+            </div>
+            <div class="mt-4" v-else>
+                <button
+                    type="button"
+                    class="relative block w-full rounded-lg border-2 border-dashed border-gray-300 p-12 text-center hover:border-gray-400 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"
+                >
+                    <span class="mt-2 block text-sm font-semibold text-gray-900"
+                        >No samples</span
+                    >
+                </button>
+            </div>
+        </div>
+        <div v-else class="text-gray-400">
+            <svg
+                class="animate-spin inline -ml-1 mr-2 h-5 w-5 text-dark"
+                xmlns="http://www.w3.org/2000/svg"
+                fill="none"
+                viewBox="0 0 24 24"
+            >
+                <circle
+                    class="opacity-25"
+                    cx="12"
+                    cy="12"
+                    r="10"
+                    stroke="currentColor"
+                    stroke-width="4"
+                ></circle>
+                <path
+                    class="opacity-75"
+                    fill="currentColor"
+                    d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
+                ></path>
+            </svg>
+            Loading...
+        </div>
+        <!-- <study-create :project="project"></study-create> -->
+    </div>
+</template>
+
+<script>
+import { Link } from "@inertiajs/vue3";
+import StudyCreate from "@/Pages/Study/Partials/Create.vue";
+import StudyCard from "@/Shared/StudyCardPublic.vue";
+import JetButton from "@/Jetstream/Button.vue";
+import { ArrowLongLeftIcon, ArrowLongRightIcon } from "@heroicons/vue/24/solid";
+
+export default {
+    components: {
+        Link,
+        StudyCreate,
+        StudyCard,
+        JetButton,
+        ArrowLongLeftIcon,
+        ArrowLongRightIcon,
+    },
+    props: {
+        studies: {
+            default: [],
+            type: Object,
+        },
+        role: {
+            default: {},
+            type: Object,
+        },
+        teamRole: {
+            default: null,
+            type: Object,
+        },
+    },
+    data() {
+        return {
+            loading: false,
+            query: "",
+        };
+    },
+    mounted() {
+        if (this.studies.length > 0) {
+            this.loading = false;
+        }
+    },
+    methods: {
+        fetchStudies(url) {
+            axios.get(url).then((response) => {
+                this.loading = false;
+                this.studies = response.data;
+            });
+        },
+    },
+};
+</script>
diff --git a/resources/js/Shared/SpectraEditor.vue b/resources/js/Shared/SpectraEditor.vue
index efc5b630..1a9011ff 100644
--- a/resources/js/Shared/SpectraEditor.vue
+++ b/resources/js/Shared/SpectraEditor.vue
@@ -105,6 +105,7 @@ export default {
             resetInProgress: false,
             info: null,
             version: null,
+            eventRegistered: false,
         };
     },
     computed: {
@@ -124,12 +125,12 @@ export default {
         },
     },
     watch: {
-        dataset: {
-            immediate: true,
-            handler() {
-                this.loadSpectra();
-            },
-        },
+        // dataset: {
+        //     immediate: true,
+        //     handler() {
+        //         this.loadSpectra();
+        //     },
+        // },
         study: {
             immediate: true,
             handler() {
@@ -233,14 +234,14 @@ export default {
                     }
                 }
             };
-            if (!this.$props.eventRegistered) {
+            if (!this.eventRegistered) {
                 console.log("events registered");
                 window.addEventListener("message", saveNMRiumUpdates);
-                this.$props.eventRegistered = true;
+                this.eventRegistered = true;
             }
             // else {
-            // window.removeEventListener("message", saveNMRiumUpdates);
-            // this.$props.eventRegistered = false;
+            //     window.removeEventListener("message", saveNMRiumUpdates);
+            //     this.$props.eventRegistered = false;
             // }
         },
         loadSpectra() {
@@ -492,7 +493,7 @@ export default {
         updateLoadingStatus(status, message) {
             this.$emit("loading", {
                 status: status,
-                message: message,
+                message: message ? message : "",
             });
         },
         infoLog(message, reset) {
diff --git a/resources/js/Shared/StudyCard.vue b/resources/js/Shared/StudyCard.vue
index e3f97232..f99cf413 100644
--- a/resources/js/Shared/StudyCard.vue
+++ b/resources/js/Shared/StudyCard.vue
@@ -14,15 +14,13 @@
                         >
                             <span
                                 v-if="
-                                    study.molecules[0] &&
-                                    study.molecules[0].canonical_smiles
+                                    molecules[0] &&
+                                    molecules[0].canonical_smiles
                                 "
                             >
                                 <Depictor2D
                                     class="py-2"
-                                    :molecule="
-                                        study.molecules[0].canonical_smiles
-                                    "
+                                    :molecule="molecules[0].canonical_smiles"
                                     :show-download="false"
                                 ></Depictor2D>
                             </span>
@@ -127,12 +125,17 @@ export default {
         Depictor2D,
     },
     props: ["study"],
-    setup() {},
     data() {
         return {
             selectedPreviewIndex: 0,
         };
     },
-    methods: {},
+    computed: {
+        molecules() {
+            return this.study.molecules
+                ? this.study.molecules
+                : this.study.sample.molecules;
+        },
+    },
 };
 </script>
diff --git a/storage/api-docs/api-docs.json b/storage/api-docs/api-docs.json
index d3803012..38e642c8 100644
--- a/storage/api-docs/api-docs.json
+++ b/storage/api-docs/api-docs.json
@@ -203,7 +203,7 @@
                     "public"
                 ],
                 "summary": "Fetch all models",
-                "description": "Fetch details for all publicly available models on nmrXiv.",
+                "description": "Fetch details for all publicly available models (i.e. projects, samples, datasets) on nmrXiv.",
                 "operationId": "publicModels",
                 "parameters": [
                     {
@@ -212,7 +212,12 @@
                         "description": "data model",
                         "required": true,
                         "schema": {
-                            "type": "string"
+                            "type": "string",
+                            "enum": [
+                                "projects",
+                                "samples",
+                                "datasets"
+                            ]
                         }
                     }
                 ],