diff --git a/CHANGELOG.md b/CHANGELOG.md
index b257d0e2..11d7fe67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## [1.0.1-rc.9](https://github.com/NFDI4Chem/nmrxiv/compare/v1.0.0-rc.9...v1.0.1-rc.9) (2023-11-15)
+
+
+### Bug Fixes
+
+* added titles to public pages and various other minor updates ([cca8fce](https://github.com/NFDI4Chem/nmrxiv/commit/cca8fcedf053d0b341b3bf26846b590289bcaac3))
+* dataset spectra parsing updates / issues fixes ([4c71480](https://github.com/NFDI4Chem/nmrxiv/commit/4c714807d92939b241c7d6b302fd2b34e92fd3bc))
+* FSBrowser folder truncate enabled ([ca44ca9](https://github.com/NFDI4Chem/nmrxiv/commit/ca44ca98932512decaa46331a90618d2f8cb71cb))
+* resolved [#645](https://github.com/NFDI4Chem/nmrxiv/issues/645) ([da98574](https://github.com/NFDI4Chem/nmrxiv/commit/da9857406fa305f9c658d13d47f50ea8ff28f871))
+* resolves [#804](https://github.com/NFDI4Chem/nmrxiv/issues/804) download issue ([13da87a](https://github.com/NFDI4Chem/nmrxiv/commit/13da87a23c23ced2539cd446e1d239bc54264a94))
+* update postgres version to 15.4 ([87099f3](https://github.com/NFDI4Chem/nmrxiv/commit/87099f376aa0833c792bae48c2a2255043501ebf))
+* updated messages in the upload screen and also formatting changes ([40d147b](https://github.com/NFDI4Chem/nmrxiv/commit/40d147bd6ed0b9edafbf61a91a552d34ad2e9d0c))
+* various bug fixes and updates ([f7ca828](https://github.com/NFDI4Chem/nmrxiv/commit/f7ca828d6a04b8fc485645f54103fe4dac624477))
+
 ## [1.0.1-rc.8](https://github.com/NFDI4Chem/nmrxiv/compare/v1.0.0-rc.8...v1.0.1-rc.8) (2023-11-13)
 
 
diff --git a/app/Console/Commands/ExtractSpectra.php b/app/Console/Commands/ExtractSpectra.php
index ae6e55ec..359af77c 100644
--- a/app/Console/Commands/ExtractSpectra.php
+++ b/app/Console/Commands/ExtractSpectra.php
@@ -79,78 +79,87 @@ public function handle()
                                 }
                             }
                         });
-                    } else {
+                    }
+                    $study = $study->fresh();
+                    if ($study->has_nmrium) {
                         $nmriumInfo = json_decode($study->nmrium['nmrium_info'], true);
                         if (count($nmriumInfo['data']['spectra']) == 0) {
                             echo '--MISSING SPECTRA INFO (NMRIUM JSON)--';
                             echo "\r\n";
-                        }
-                    }
-                } catch (Exception $e) {
-                    echo 'Caught exception: ',  $e->getMessage(), "\n";
-                }
-                $study = $study->fresh();
-                foreach ($study->datasets as $dataset) {
-                    // echo $dataset->identifier;
-                    // echo "\r\n";
-                    // if(!$dataset->has_nmrium){
-                    $nmriumInfo = json_decode($study->nmrium['nmrium_info'], true);
-                    $_nmriumJSON = $nmriumInfo;
-                    $fsObject = $dataset->fsObject;
+                        } else {
+                            foreach ($study->datasets as $dataset) {
+                                echo $dataset->identifier;
+                                echo "\r\n";
+                                // if(!$dataset->has_nmrium){
+                                $nmriumInfo = json_decode($study->nmrium['nmrium_info'], true);
+                                $_nmriumJSON = $nmriumInfo;
+                                $fsObject = $dataset->fsObject;
 
-                    $studyFSObject = $study->fsObject;
-                    $datasetFSObject = $dataset->fsObject;
-                    $path = '/'.$studyFSObject->name.'/'.$datasetFSObject->name;
-                    // echo($path);
-                    // echo "\r\n";
-                    $pathsMatch = false;
-                    foreach ($nmriumInfo['data']['spectra'] as $spectra) {
-                        unset($_nmriumJSON['data']['spectra']);
-                        $files = $spectra['sourceSelector']['files'];
-                        if ($files) {
-                            foreach ($files as $file) {
-                                if (str_contains($file, $path)) {
-                                    $pathsMatch = true;
-                                }
-                            }
-                        }
-                        if ($pathsMatch) {
-                            break;
-                        }
-                    }
-                    if (! $pathsMatch) {
-                        echo $project->identifier;
-                        echo "\r\n";
+                                $studyFSObject = $study->fsObject;
+                                $datasetFSObject = $dataset->fsObject;
+                                $path = '/'.$studyFSObject->name.'/'.$datasetFSObject->name;
+                                // echo($path);
+                                // echo "\r\n";
+                                $fsObject = $dataset->fsObject;
+                                $studyFSObject = $study->fsObject;
+                                $datasetFSObject = $dataset->fsObject;
+                                $path = '/'.$studyFSObject->name.'/'.$datasetFSObject->name;
 
-                        echo '===========> no match';
-                        echo "\r\n";
-                    } else {
-                        $_nmriumJSON['data']['spectra'] = [$spectra];
-                        $_nmrium = $dataset->nmrium;
-                        if ($_nmrium) {
-                            $_nmrium->nmrium_info = json_encode($_nmriumJSON, JSON_UNESCAPED_UNICODE);
-                            $dataset->has_nmrium = true;
-                            $_nmrium->save();
-                        } else {
-                            $_nmrium = NMRium::create([
-                                'nmrium_info' => json_encode($_nmriumJSON, JSON_UNESCAPED_UNICODE),
-                            ]);
-                            $dataset->nmrium()->save($_nmrium);
-                            $dataset->has_nmrium = true;
-                        }
-                        $experimentDetailsExists = array_key_exists('experiment', $spectra['info']);
-                        if ($experimentDetailsExists) {
-                            $experiment = $spectra['info']['experiment'];
-                            $nucleus = $spectra['info']['nucleus'];
-                            if (is_array($nucleus)) {
-                                $nucleus = implode('-', $nucleus);
+                                $pathsMatch = false;
+                                $spectrum = [];
+                                $type = [];
+                                foreach ($nmriumInfo['data']['spectra'] as $spectra) {
+                                    unset($_nmriumJSON['data']['spectra']);
+                                    $files = $spectra['sourceSelector']['files'];
+                                    if ($files) {
+                                        foreach ($files as $file) {
+                                            if (str_contains($file, $path)) {
+                                                $pathsMatch = true;
+                                            }
+                                        }
+                                    }
+                                    if ($pathsMatch) {
+                                        array_push($spectrum, $spectra);
+                                        $experimentDetailsExists = array_key_exists('experiment', $spectra['info']);
+                                        if ($experimentDetailsExists) {
+                                            $experiment = $spectra['info']['experiment'];
+                                            $nucleus = $spectra['info']['nucleus'];
+                                            if (is_array($nucleus)) {
+                                                $nucleus = implode('-', $nucleus);
+                                            }
+                                            array_push($type, $experiment.' - '.$nucleus);
+                                        }
+                                        $pathsMatch = false;
+                                    }
+                                }
+                                if (count($spectrum) > 0) {
+                                    $_nmriumJSON['data']['spectra'] = $spectrum;
+                                    $_nmrium = $dataset->nmrium;
+                                    if ($_nmrium) {
+                                        $_nmrium->nmrium_info = json_encode($_nmriumJSON, JSON_UNESCAPED_UNICODE);
+                                        $dataset->has_nmrium = true;
+                                        $_nmrium->save();
+                                    } else {
+                                        $_nmrium = NMRium::create([
+                                            'nmrium_info' => json_encode($_nmriumJSON, JSON_UNESCAPED_UNICODE),
+                                        ]);
+                                        $dataset->nmrium()->save($_nmrium);
+                                        $dataset->has_nmrium = true;
+                                    }
+                                }
+                                $uType = array_unique($type);
+                                if (count($uType) == 1) {
+                                    $dataset->type = $uType[0];
+                                }
+                                $dataset->save();
+                                // }
                             }
-                            $dataset->type = $experiment.','.$nucleus;
                         }
-                        $dataset->save();
                     }
-                    // }
+                } catch (Exception $e) {
+                    echo 'Caught exception: ',  $e->getMessage(), "\n";
                 }
+
             }
         }
     }
diff --git a/app/Http/Controllers/DownloadController.php b/app/Http/Controllers/DownloadController.php
index 9364f4ec..6ef0ebf3 100644
--- a/app/Http/Controllers/DownloadController.php
+++ b/app/Http/Controllers/DownloadController.php
@@ -102,17 +102,22 @@ public function downloadFromProject(Request $request, $username, $project, $key
                     array_push($s3keys, substr($fsObj->path, 1));
                 }
             } else {
-                $command = $s3Client->getCommand('ListObjects');
-                $command['Bucket'] = $bucket;
+
+                $command = [
+                    'Bucket' => $bucket,
+                ];
                 if ($path[0] == '/') {
                     $command['Prefix'] = ltrim($path, $path[0]).'/';
                 } else {
                     $command['Prefix'] = $path.'/';
                 }
-                $result = $s3Client->execute($command);
-                if ($result['Contents']) {
-                    foreach ($result['Contents'] as $file) {
-                        array_push($s3keys, $file['Key']);
+                $results = $s3Client->getPaginator('ListObjects', $command);
+                foreach ($results as $result) {
+                    $contents = $result->get('Contents');
+                    if ($contents) {
+                        foreach ($contents as $file) {
+                            array_push($s3keys, $file['Key']);
+                        }
                     }
                 }
             }
diff --git a/app/Http/Controllers/DraftController.php b/app/Http/Controllers/DraftController.php
index 2f4bc894..eacde9f6 100644
--- a/app/Http/Controllers/DraftController.php
+++ b/app/Http/Controllers/DraftController.php
@@ -548,7 +548,13 @@ public function isJcampDX($folder)
             $isDX = true;
         }
 
-        if ($isJDX || $isDX) {
+        $fileTypes = ['jcamp'];
+        $isJCAMP = false;
+        if (array_intersect($fileTypes, $extensions) == $fileTypes) {
+            $isJCAMP = true;
+        }
+
+        if ($isJDX || $isDX || $isJCAMP) {
             return true;
         }
 
diff --git a/app/Http/Controllers/StudyController.php b/app/Http/Controllers/StudyController.php
index 787b71a0..21c06f4c 100644
--- a/app/Http/Controllers/StudyController.php
+++ b/app/Http/Controllers/StudyController.php
@@ -213,8 +213,10 @@ public function nmriumInfo(Request $request, Study $study)
                 $studyFSObject = $study->fsObject;
                 $datasetFSObject = $dataset->fsObject;
                 $path = '/'.$studyFSObject->name.'/'.$datasetFSObject->name;
-                    
+
                 $pathsMatch = false;
+                $spectrum = [];
+                $type = [];
                 foreach ($nmriumInfo['data']['spectra'] as $spectra) {
                     unset($_nmriumJSON['data']['spectra']);
                     $files = $spectra['sourceSelector']['files'];
@@ -226,11 +228,21 @@ public function nmriumInfo(Request $request, Study $study)
                         }
                     }
                     if ($pathsMatch) {
-                        break;
+                        array_push($spectrum, $spectra);
+                        $experimentDetailsExists = array_key_exists('experiment', $spectra['info']);
+                        if ($experimentDetailsExists) {
+                            $experiment = $spectra['info']['experiment'];
+                            $nucleus = $spectra['info']['nucleus'];
+                            if (is_array($nucleus)) {
+                                $nucleus = implode('-', $nucleus);
+                            }
+                            array_push($type, $experiment.' - '.$nucleus);
+                        }
+                        $pathsMatch = false;
                     }
                 }
-                if ($pathsMatch){
-                    $_nmriumJSON['data']['spectra'] = [$spectra];
+                if (count($spectrum) > 0) {
+                    $_nmriumJSON['data']['spectra'] = $spectrum;
                     $_nmrium = $dataset->nmrium;
                     if ($_nmrium) {
                         $_nmrium->nmrium_info = json_encode($_nmriumJSON, JSON_UNESCAPED_UNICODE);
@@ -243,17 +255,13 @@ public function nmriumInfo(Request $request, Study $study)
                         $dataset->nmrium()->save($_nmrium);
                         $dataset->has_nmrium = true;
                     }
-                    $experimentDetailsExists = array_key_exists('experiment', $spectra['info']);
-                    if ($experimentDetailsExists) {
-                        $experiment = $spectra['info']['experiment'];
-                        $nucleus = $spectra['info']['nucleus'];
-                        if (is_array($nucleus)) {
-                            $nucleus = implode('-', $nucleus);
-                        }
-                        $dataset->type = $experiment.','.$nucleus;
-                    }
-                    $dataset->save();
                 }
+                $uType = array_unique($type);
+                if (count($uType) == 1) {
+                    $dataset->type = $uType[0];
+                }
+                $dataset->save();
+
             }
 
             return $study->fresh();
diff --git a/app/Jobs/ArchiveProject.php b/app/Jobs/ArchiveProject.php
index 1d248758..b203abca 100644
--- a/app/Jobs/ArchiveProject.php
+++ b/app/Jobs/ArchiveProject.php
@@ -72,17 +72,21 @@ public function handle(): void
                                 array_push($s3keys, substr($fsObject->path, 1));
                             }
                         } else {
-                            $command = $s3Client->getCommand('ListObjects');
-                            $command['Bucket'] = $bucket;
+                            $command = [
+                                'Bucket' => $bucket,
+                            ];
                             if ($path[0] == '/') {
                                 $command['Prefix'] = ltrim($path, $path[0]).'/';
                             } else {
                                 $command['Prefix'] = $path.'/';
                             }
-                            $result = $s3Client->execute($command);
-                            if ($result['Contents']) {
-                                foreach ($result['Contents'] as $file) {
-                                    array_push($s3keys, $file['Key']);
+                            $results = $s3Client->getPaginator('ListObjects', $command);
+                            foreach ($results as $result) {
+                                $contents = $result->get('Contents');
+                                if ($contents) {
+                                    foreach ($contents as $file) {
+                                        array_push($s3keys, $file['Key']);
+                                    }
                                 }
                             }
                         }
diff --git a/app/Jobs/ArchiveStudy.php b/app/Jobs/ArchiveStudy.php
index f6111300..5ba6748b 100644
--- a/app/Jobs/ArchiveStudy.php
+++ b/app/Jobs/ArchiveStudy.php
@@ -59,17 +59,22 @@ public function handle(): void
                                 array_push($s3keys, substr($fsObject->path, 1));
                             }
                         } else {
-                            $command = $s3Client->getCommand('ListObjects');
-                            $command['Bucket'] = $bucket;
+
+                            $command = [
+                                'Bucket' => $bucket,
+                            ];
                             if ($path[0] == '/') {
                                 $command['Prefix'] = ltrim($path, $path[0]).'/';
                             } else {
                                 $command['Prefix'] = $path.'/';
                             }
-                            $result = $s3Client->execute($command);
-                            if ($result['Contents']) {
-                                foreach ($result['Contents'] as $file) {
-                                    array_push($s3keys, $file['Key']);
+                            $results = $s3Client->getPaginator('ListObjects', $command);
+                            foreach ($results as $result) {
+                                $contents = $result->get('Contents');
+                                if ($contents) {
+                                    foreach ($contents as $file) {
+                                        array_push($s3keys, $file['Key']);
+                                    }
                                 }
                             }
                         }
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index a83c403d..747ebd94 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -2,6 +2,7 @@
 
 namespace App\Providers;
 
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\ServiceProvider;
 
 class AppServiceProvider extends ServiceProvider
@@ -26,7 +27,7 @@ public function register()
      */
     public function boot()
     {
-        if ($this->app->environment('production')) {
+        if (App::environment() == 'production') {
             \URL::forceScheme('https');
         }
     }
diff --git a/database/scripts/sync_index.sql b/database/scripts/sync_index.sql
new file mode 100644
index 00000000..6fe93e66
--- /dev/null
+++ b/database/scripts/sync_index.sql
@@ -0,0 +1,50 @@
+SELECT setval('announcements_id_seq', max(id)) FROM announcements;
+SELECT setval('assays_id_seq', max(id)) FROM assays;
+SELECT setval('audits_id_seq', max(id)) FROM audits;
+SELECT setval('author_project_id_seq', max(id)) FROM author_project;
+SELECT setval('authors_id_seq', max(id)) FROM authors;
+SELECT setval('citation_project_id_seq', max(id)) FROM citation_project;
+SELECT setval('citations_id_seq', max(id)) FROM citations;
+SELECT setval('dataset_invitations_id_seq', max(id)) FROM dataset_invitations;
+SELECT setval('dataset_molecule_id_seq', max(id)) FROM dataset_molecule;
+SELECT setval('dataset_user_id_seq', max(id)) FROM dataset_user;
+SELECT setval('datasets_id_seq', max(id)) FROM datasets;
+SELECT setval('drafts_id_seq', max(id)) FROM drafts;
+SELECT setval('failed_jobs_id_seq', max(id)) FROM failed_jobs;
+SELECT setval('file_system_objects_id_seq', max(id)) FROM file_system_objects;
+SELECT setval('licenses_id_seq', max(id)) FROM licenses;
+SELECT setval('linked_social_accounts_id_seq', max(id)) FROM linked_social_accounts;
+SELECT setval('markable_reactions_id_seq', max(id)) FROM markable_reactions;
+SELECT setval('markable_likes_id_seq', max(id)) FROM markable_likes;
+SELECT setval('markable_favorites_id_seq', max(id)) FROM markable_favorites;
+SELECT setval('markable_bookmarks_id_seq', max(id)) FROM markable_bookmarks;
+SELECT setval('migrations_id_seq', max(id)) FROM migrations;
+-- model_has_permissions -- combi
+-- model_has_roles SELECT setval('molecule_sample_id_seq', max(id)) FROM molecule_sample; -- combi
+SELECT setval('molecule_sample_id_seq', max(id)) FROM molecule_sample;
+SELECT setval('molecules_id_seq', max(id)) FROM molecules;
+SELECT setval('nmrium_id_seq', max(id)) FROM nmrium;
+-- SELECT setval('notifications_id_seq', max(id)) FROM notifications; UUID
+-- SELECT setval('password_resets_id_seq', max(id)) FROM password_resets; no pkey
+SELECT setval('permissions_id_seq', max(id)) FROM permissions;
+SELECT setval('personal_access_tokens_id_seq', max(id)) FROM personal_access_tokens;
+SELECT setval('project_invitations_id_seq', max(id)) FROM project_invitations;
+SELECT setval('project_user_id_seq', max(id)) FROM project_user;
+SELECT setval('projects_id_seq', max(id)) FROM projects;
+-- role_has_permissions SELECT setval('role_has_permissions_id_seq', max(id)) FROM role_has_permissions; -- combi
+SELECT setval('roles_id_seq', max(id)) FROM roles;
+SELECT setval('samples_id_seq', max(id)) FROM samples;
+-- SELECT setval('sessions_id_seq', max(id)) FROM sessions; UUID
+SELECT setval('studies_id_seq', max(id)) FROM studies;
+SELECT setval('study_invitations_id_seq', max(id)) FROM study_invitations;
+SELECT setval('study_user_id_seq', max(id)) FROM study_user;
+-- SELECT setval('taggables_id_seq', max(id)) FROM taggables; no pkey
+SELECT setval('tags_id_seq', max(id)) FROM tags;
+SELECT setval('team_invitations_id_seq', max(id)) FROM team_invitations;
+SELECT setval('team_user_id_seq', max(id)) FROM team_user;
+SELECT setval('teams_id_seq', max(id)) FROM teams;
+SELECT setval('templates_id_seq', max(id)) FROM templates;
+SELECT setval('tickers_id_seq', max(id)) FROM tickers;
+SELECT setval('users_id_seq', max(id)) FROM users;
+SELECT setval('validations_id_seq', max(id)) FROM validations;
+SELECT setval('versions_version_id_seq', max(version_id)) FROM versions;
\ No newline at end of file
diff --git a/resources/js/App/FAQs.vue b/resources/js/App/FAQs.vue
new file mode 100644
index 00000000..7ac1a136
--- /dev/null
+++ b/resources/js/App/FAQs.vue
@@ -0,0 +1,77 @@
+<template>
+    <div class="bg-white">
+        <div class="mx-auto max-w-7xl px-6 py-24 sm:py-32 lg:px-8 lg:py-40">
+            <div class="mx-auto max-w-4xl divide-y divide-gray-900/10">
+                <h2
+                    class="text-2xl font-bold leading-10 tracking-tight text-gray-900"
+                >
+                    Frequently asked questions
+                </h2>
+                <dl class="mt-10 space-y-6 divide-y divide-gray-900/10">
+                    <Disclosure
+                        as="div"
+                        v-for="faq in faqs.slice(0, limit)"
+                        :key="faq.question"
+                        class="pt-6"
+                        v-slot="{ open }"
+                    >
+                        <dt>
+                            <DisclosureButton
+                                class="flex w-full items-start justify-between text-left text-gray-900"
+                            >
+                                <span
+                                    class="text-base font-semibold leading-7"
+                                    >{{ faq.question }}</span
+                                >
+                                <span class="ml-6 flex h-7 items-center">
+                                    <PlusSmallIcon
+                                        v-if="!open"
+                                        class="h-6 w-6"
+                                        aria-hidden="true"
+                                    />
+                                    <MinusSmallIcon
+                                        v-else
+                                        class="h-6 w-6"
+                                        aria-hidden="true"
+                                    />
+                                </span>
+                            </DisclosureButton>
+                        </dt>
+                        <DisclosurePanel as="dd" class="mt-2 pr-12">
+                            <p class="text-base leading-7 text-gray-600">
+                                {{ faq.answer }}
+                            </p>
+                        </DisclosurePanel>
+                    </Disclosure>
+                </dl>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup>
+import { Disclosure, DisclosureButton, DisclosurePanel } from "@headlessui/vue";
+import { MinusSmallIcon, PlusSmallIcon } from "@heroicons/vue/24/outline";
+
+const props = defineProps(["limit"]);
+
+const faqs = [
+    {
+        question: "How can I submit my data to nmrXiv?",
+        answer: " Register to nmrXiv. Structure your data in folders similar to nmrXiv structuring of projects, studies, and datasets. This step might not be intuitive so we recommend checking its docummentation. Upload your data, edit it, and provide its metadata via the submission pipeline.",
+    },
+    {
+        question: "What should I do if I think I've found a bug?",
+        answer: "If you believe you've found a bug in nmrXiv, please write to us at info.nmrxiv@uni-jena.de or reach out to our Helpdesk https://www.nfdi4chem.de/helpdesk/.",
+    },
+    {
+        question: "Who can use my public/published resources?",
+        answer: "If you make your resources public (projects, studies, datasets), you are making them open for access to everyone (even to the non-registered user of nmrXiv), but you can specify rights by choosing licenses for your projects and studies (study license propagate to its datasets). Once your project is made public, you cannot edit, delete or make it private again.",
+    },
+    {
+        question: "What are supported files format in nmrXiv?",
+        answer: "nmrXiv accepts all NMR formats uploaded. However, not all of them are readable at the moment. So far, only NMRium-supported formats can be translated into spectra in nmrXiv. Those formats are jcamp-dx, jeol, Bruker folders, NMReData, and nmrium. For validation purposes, the uploaded data should have at least one readable format.",
+    },
+    // More questions...
+];
+</script>
diff --git a/resources/js/Layouts/AppLayout.vue b/resources/js/Layouts/AppLayout.vue
index c46e6c7a..b33879ef 100644
--- a/resources/js/Layouts/AppLayout.vue
+++ b/resources/js/Layouts/AppLayout.vue
@@ -59,7 +59,7 @@
                             </div>
                         </TransitionChild>
                         <div class="flex-shrink-0 flex items-center px-4">
-                            <Link :href="route('dashboard')">
+                            <Link :href="route('welcome')">
                                 <jet-application-logo
                                     class="block h-8 w-auto"
                                 />
diff --git a/resources/js/Pages/Public/Project/Dataset.vue b/resources/js/Pages/Public/Project/Dataset.vue
index f70c4f32..14ad36a0 100644
--- a/resources/js/Pages/Public/Project/Dataset.vue
+++ b/resources/js/Pages/Public/Project/Dataset.vue
@@ -1,18 +1,27 @@
 <template>
+    <Head :title="dataset.data.name + ' - ' + study.data.name" />
     <project-layout :project="project" :selected-tab="tab">
         <template #project-content>
             <div
                 class="pb-10 mb-10 max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-6"
             >
                 <h1 class="mt-2 text-2xl font-bold break-words text-gray-900">
-                    <span class="text-blue-500">
-                        {{ study.data.name }}
+                    <span>
+                        {{ study.data.name }} >
+                        <span class="text-blue-500"
+                            >{{ dataset.data.name }}
+                            <span v-if="dataset.data.type"
+                                >- ({{
+                                    dataset.data.type.replace(/,\s*$/, "")
+                                }})</span
+                            ></span
+                        >
                     </span>
                     <div class="text-sm">
                         <span class="text-gray-400 pt-2">
                             <DOIBadge
-                                :doi="study.data.doi"
-                                color="bg-yellow-300"
+                                :doi="dataset.data.doi"
+                                color="bg-green-100"
                             ></DOIBadge>
                         </span>
                     </div>
@@ -91,14 +100,6 @@
                             </Menu>
                         </span>
                     </div>
-
-                    <div class="text-sm float-right mr-4">
-                        <div
-                            class="inline hover:text-blue-600 hover:cursor-pointer text-gray-200"
-                        >
-                            #{{ study.data.identifier }}
-                        </div>
-                    </div>
                 </h1>
                 <!-- <div class="mt-4">
                     <div class="relative">
@@ -122,6 +123,33 @@
                         v-html="md(study.data.description)"
                     ></p>
                 </div> -->
+                <div class="mt-4">
+                    <div class="relative">
+                        <div
+                            class="absolute inset-0 flex items-center"
+                            aria-hidden="true"
+                        >
+                            <div class="w-full border-t border-gray-100"></div>
+                        </div>
+                        <div class="relative flex items-center justify-between">
+                            <span
+                                class="pr-3 text-md bg-white font-medium text-gray-400"
+                            >
+                                Spectra
+                            </span>
+                        </div>
+                    </div>
+                    <h1
+                        class="mt-2 text-2xl font-bold break-words text-gray-900"
+                    ></h1>
+                    <div class="my-7">
+                        <SpectraViewer
+                            :dataset="dataset.data"
+                            :project="project.data"
+                            :study="study.data"
+                        ></SpectraViewer>
+                    </div>
+                </div>
                 <div v-if="study.data.tags.length > 0" class="mt-4">
                     <div class="relative">
                         <div
@@ -247,13 +275,12 @@
                                                             <div
                                                                 class="rounded-md border my-3 flex justify-center items-center"
                                                             >
-                                                                <span
-                                                                    v-html="
-                                                                        getSVGString(
-                                                                            molecule
-                                                                        )
+                                                                <Depictor2D
+                                                                    class="py-4 -px-4"
+                                                                    :molecule="
+                                                                        molecule.CANONICAL_SMILES
                                                                     "
-                                                                ></span>
+                                                                ></Depictor2D>
                                                             </div>
                                                         </div>
                                                     </div>
@@ -285,48 +312,6 @@
                         </div>
                     </div>
                 </div>
-                <div class="mt-4">
-                    <div class="relative">
-                        <div
-                            class="absolute inset-0 flex items-center"
-                            aria-hidden="true"
-                        >
-                            <div class="w-full border-t border-gray-100"></div>
-                        </div>
-                        <div class="relative flex items-center justify-between">
-                            <span
-                                class="pr-3 text-md bg-white font-medium text-gray-400"
-                            >
-                                Spectra
-                            </span>
-                        </div>
-                    </div>
-                    <h1
-                        class="mt-2 text-2xl font-bold break-words text-gray-900"
-                    >
-                        {{ dataset.data.name }}
-                        <span v-if="dataset.data.type"
-                            >- ({{
-                                dataset.data.type.replace(/,\s*$/, "")
-                            }})</span
-                        ><br />
-                        <div class="text-sm">
-                            <span class="text-gray-400 pt-2">
-                                <DOIBadge
-                                    :doi="dataset.data.doi"
-                                    color="bg-green-100"
-                                ></DOIBadge>
-                            </span>
-                        </div>
-                    </h1>
-                    <div class="my-7">
-                        <SpectraViewer
-                            :dataset="dataset.data"
-                            :project="project.data"
-                            :study="study.data"
-                        ></SpectraViewer>
-                    </div>
-                </div>
             </div>
         </template>
     </project-layout>
@@ -341,6 +326,8 @@ import { ShareIcon, ClipboardDocumentIcon } from "@heroicons/vue/24/solid";
 import { Menu, MenuButton, MenuItem, MenuItems } from "@headlessui/vue";
 import SpectraViewer from "@/Shared/SpectraViewer.vue";
 import DOIBadge from "@/Shared/DOIBadge.vue";
+import Depictor2D from "@/Shared/Depictor2D.vue";
+import { Head } from "@inertiajs/vue3";
 
 export default {
     components: {
@@ -353,6 +340,8 @@ export default {
         MenuItems,
         SpectraViewer,
         DOIBadge,
+        Depictor2D,
+        Head,
     },
     props: ["project", "tab", "study", "dataset"],
     data() {
@@ -376,15 +365,5 @@ export default {
                 this.schema = response.data;
             });
     },
-    methods: {
-        getSVGString(molecule) {
-            if (molecule.MOL) {
-                let mol = OCL.Molecule.fromMolfile(
-                    "\n  " + molecule.MOL.replaceAll('"', "")
-                );
-                return mol.toSVG(200, 200);
-            }
-        },
-    },
 };
 </script>
diff --git a/resources/js/Pages/Public/Project/Files.vue b/resources/js/Pages/Public/Project/Files.vue
index e94d0af1..84db7b94 100644
--- a/resources/js/Pages/Public/Project/Files.vue
+++ b/resources/js/Pages/Public/Project/Files.vue
@@ -1,4 +1,5 @@
 <template>
+    <Head :title="'Files - ' + project.data.name" />
     <project-layout :project="project" :selected-tab="tab">
         <template #project-content>
             <div
@@ -83,6 +84,7 @@ import {
     ChevronRightIcon,
     HomeIcon,
 } from "@heroicons/vue/24/solid";
+import { Head } from "@inertiajs/vue3";
 
 export default {
     components: {
@@ -92,6 +94,7 @@ export default {
         ChevronRightIcon,
         HomeIcon,
         FileSystemBrowser,
+        Head,
     },
     props: ["project", "tab"],
     data() {
diff --git a/resources/js/Pages/Public/Project/Layout.vue b/resources/js/Pages/Public/Project/Layout.vue
index ebfe08d6..8db6d600 100644
--- a/resources/js/Pages/Public/Project/Layout.vue
+++ b/resources/js/Pages/Public/Project/Layout.vue
@@ -177,6 +177,7 @@ import AppLayout from "@/Layouts/AppLayout.vue";
 import { Link, router } from "@inertiajs/vue3";
 import { ArrowDownTrayIcon } from "@heroicons/vue/24/solid";
 import DOIBadge from "@/Shared/DOIBadge.vue";
+
 export default {
     components: {
         AppLayout,
diff --git a/resources/js/Pages/Public/Project/License.vue b/resources/js/Pages/Public/Project/License.vue
index 4287c712..19a50905 100644
--- a/resources/js/Pages/Public/Project/License.vue
+++ b/resources/js/Pages/Public/Project/License.vue
@@ -1,4 +1,5 @@
 <template>
+    <Head :title="'License - ' + project.data.name" />
     <project-layout :project="project" :selected-tab="tab">
         <template #project-content>
             <div
@@ -28,10 +29,12 @@
 
 <script>
 import ProjectLayout from "@/Pages/Public/Project/Layout.vue";
+import { Head } from "@inertiajs/vue3";
 
 export default {
     components: {
         ProjectLayout,
+        Head,
     },
     props: ["project", "tab"],
     data() {
diff --git a/resources/js/Pages/Public/Project/Samples.vue b/resources/js/Pages/Public/Project/Samples.vue
index dd623430..d3cd6971 100644
--- a/resources/js/Pages/Public/Project/Samples.vue
+++ b/resources/js/Pages/Public/Project/Samples.vue
@@ -1,4 +1,5 @@
 <template>
+    <Head :title="'Samples - ' + project.data.name" />
     <project-layout :project="project" :selected-tab="tab">
         <template #project-content>
             <div
@@ -144,11 +145,13 @@
 <script>
 import ProjectLayout from "@/Pages/Public/Project/Layout.vue";
 import StudyCard from "@/Shared/StudyCardPublic.vue";
+import { Head } from "@inertiajs/vue3";
 
 export default {
     components: {
         ProjectLayout,
         StudyCard,
+        Head,
     },
     props: ["project", "tab"],
     data() {
diff --git a/resources/js/Pages/Public/Project/Show.vue b/resources/js/Pages/Public/Project/Show.vue
index cd89e4ee..4734692c 100644
--- a/resources/js/Pages/Public/Project/Show.vue
+++ b/resources/js/Pages/Public/Project/Show.vue
@@ -1,4 +1,5 @@
 <template>
+    <Head :title="project.data.name" />
     <project-layout :project="project" :selected-tab="tab">
         <template #project-content>
             <div
@@ -156,6 +157,7 @@ import AuthorCard from "@/Shared/AuthorCard.vue";
 import CitationCard from "@/Shared/CitationCard.vue";
 import "ontology-elements/dist/index.js";
 import Citation from "@/Shared/Citation.vue";
+import { Head } from "@inertiajs/vue3";
 
 export default {
     components: {
@@ -163,6 +165,7 @@ export default {
         AuthorCard,
         CitationCard,
         Citation,
+        Head,
     },
     props: ["project", "tab"],
     data() {
diff --git a/resources/js/Pages/Public/Project/Study.vue b/resources/js/Pages/Public/Project/Study.vue
index d5fb6adc..605b7de1 100644
--- a/resources/js/Pages/Public/Project/Study.vue
+++ b/resources/js/Pages/Public/Project/Study.vue
@@ -1,4 +1,5 @@
 <template>
+    <Head :title="study.data.name" />
     <project-layout :project="project" :selected-tab="tab">
         <template #project-content>
             <div
@@ -438,6 +439,7 @@ import { Menu, MenuButton, MenuItem, MenuItems } from "@headlessui/vue";
 import SpectraViewer from "@/Shared/SpectraViewer.vue";
 import Depictor2D from "@/Shared/Depictor2D.vue";
 import DOIBadge from "@/Shared/DOIBadge.vue";
+import { Head } from "@inertiajs/vue3";
 
 export default {
     components: {
@@ -451,6 +453,7 @@ export default {
         SpectraViewer,
         Depictor2D,
         DOIBadge,
+        Head,
     },
     props: ["project", "tab", "study"],
     data() {
diff --git a/resources/js/Pages/Publish.vue b/resources/js/Pages/Publish.vue
index b703951e..4859fc21 100644
--- a/resources/js/Pages/Publish.vue
+++ b/resources/js/Pages/Publish.vue
@@ -689,7 +689,6 @@ import Create from "@/Shared/CreateButton.vue";
 import Onboarding from "@/App/Onboarding.vue";
 import { Link } from "@inertiajs/vue3";
 import { computed } from "vue";
-import FileSystemBrowser from "./../Shared/FileSystemBrowser.vue";
 import JetInputError from "@/Jetstream/InputError.vue";
 import axios from "axios";
 import JetSecondaryButton from "@/Jetstream/SecondaryButton.vue";
@@ -741,7 +740,6 @@ export default {
         TeamProjects,
         Create,
         Onboarding,
-        FileSystemBrowser,
         Link,
         JetInputError,
         JetSecondaryButton,
@@ -865,21 +863,20 @@ export default {
         updateProject() {
             if (this.publishForm.enableProjectMode) {
                 this.loadingStep = true;
-                axios
-                    .put(route("dashboard.project.update", this.project.id), {
-                        name: this.publishForm.project.name,
-                        description: this.publishForm.project.description,
-                        tags: this.publishForm.project.tags,
-                        tags_array: this.publishForm.project.tags
-                            ? this.publishForm.project.tags.map((a) => a.text)
-                            : [],
-                        license_id: this.license ? this.license.id : null,
-                        species: this.publishForm.project.species,
-                        release_date: this.publishForm.releaseDate,
-                    })
-                    .then((res) => {
-                        console.log("success");
-                    });
+                axios.put(route("dashboard.project.update", this.project.id), {
+                    name: this.publishForm.project.name,
+                    description: this.publishForm.project.description,
+                    tags: this.publishForm.project.tags,
+                    tags_array: this.publishForm.project.tags
+                        ? this.publishForm.project.tags.map((a) => a.text)
+                        : [],
+                    license_id: this.license ? this.license.id : null,
+                    species: this.publishForm.project.species,
+                    release_date: this.publishForm.releaseDate,
+                });
+                // .then((res) => {
+                //     console.log("success");
+                // });
             }
         },
         updateSpecies(species) {
@@ -930,8 +927,6 @@ export default {
                     "\n  " + molecule.MOL.replaceAll('"', "")
                 );
                 return mol.toSVG(200, 200);
-            } else {
-                console.log(molecule);
             }
         },
         toggleManageAuthor() {
diff --git a/resources/js/Pages/Upload.vue b/resources/js/Pages/Upload.vue
index e82b898a..f7cc9b93 100644
--- a/resources/js/Pages/Upload.vue
+++ b/resources/js/Pages/Upload.vue
@@ -735,8 +735,9 @@
                                                                                     class="list-disc space-y-1 pl-5"
                                                                                 >
                                                                                     <li>
-                                                                                        Pending:
+                                                                                        Processed:
                                                                                         {{
+                                                                                            studies.length -
                                                                                             inprogressStudies.length
                                                                                         }}
                                                                                         out
@@ -778,23 +779,12 @@
                                                                                 class="mt-2 max-w-xl text-sm text-gray-500"
                                                                             >
                                                                                 <p>
-                                                                                    Looks
-                                                                                    like
-                                                                                    we're
-                                                                                    missing
-                                                                                    some
+                                                                                    Some
                                                                                     important
                                                                                     Spectra
-                                                                                    metadata.
-                                                                                    No
-                                                                                    worries,
-                                                                                    though
-                                                                                    –
-                                                                                    We
-                                                                                    got
-                                                                                    your
-                                                                                    back
-                                                                                    covered!
+                                                                                    metadata
+                                                                                    are
+                                                                                    needed.
                                                                                     Would
                                                                                     you
                                                                                     like
@@ -2541,7 +2531,7 @@ export default {
             }),
 
             smiles: "",
-            percentage: 1,
+            percentage: 100,
             editor: null,
 
             studyForm: this.$inertia.form({
@@ -2778,7 +2768,6 @@ export default {
                 this.hasStudies(this.$refs.fsbRef.file);
                 this.fetchProjectDetails().then(
                     (response) => {
-                        console.log(response);
                         this.loadingStep = false;
                         this.project = response.data.project;
                         this.studies = response.data.studies;
@@ -3175,7 +3164,7 @@ export default {
             // }
         },
         updateLoadingStatus(status) {
-            console.log(status);
+            // console.log(status);
             this.loading = status;
         },
         fetchDrafts() {
@@ -3363,7 +3352,7 @@ export default {
                 }
                 this.spectraLoadingMessage =
                     "<br/> <small><i>Pending: " +
-                    this.importPendingSamples.length +
+                    (this.studies.length - this.importPendingSamples.length) +
                     "/" +
                     this.studies.length +
                     "</i></small> <br/> Processing Spectra from Sample: " +
diff --git a/resources/js/Pages/Welcome.vue b/resources/js/Pages/Welcome.vue
index 0905bcae..ef8c24fe 100644
--- a/resources/js/Pages/Welcome.vue
+++ b/resources/js/Pages/Welcome.vue
@@ -301,7 +301,7 @@
                 </div>
             </div>
 
-            <div class="relative pt-16 pb-32">
+            <div class="relative pt-16">
                 <div>
                     <div
                         class="lg:mx-auto lg:max-w-7xl lg:px-8 lg:grid lg:grid-cols-2 lg:grid-flow-col-dense lg:gap-24 overflow-x-hidden py-10 border-r"
@@ -546,6 +546,11 @@
                 </div>
             </div>
 
+            <div>
+                <FAQs></FAQs>
+            </div>
+
+            <!-- Gradient Feature Section -->
             <div class="bg-gradient-to-r from-indigo-800 to-teal-700">
                 <div
                     class="max-w-4xl mx-auto px-4 py-16 sm:px-6 sm:pt-20 sm:pb-24 lg:max-w-7xl lg:pt-24 lg:px-8"
@@ -683,21 +688,25 @@
                                     Quick links
                                 </h3>
                                 <ul role="list" class="mt-4 space-y-4">
-                                    <li>
-                                        <Link
-                                            href="/projects"
+                                    <li
+                                        v-for="item in footerNavigation.quicklinks"
+                                        :key="item.name"
+                                    >
+                                    <Link
+                                            :href="item.href"
                                             class="text-base text-gray-500 hover:text-gray-900"
                                         >
-                                            Projects
+                                            {{ item.name }}
                                         </Link>
                                     </li>
                                     <li>
-                                        <Link
-                                            href="/spectra"
+                                        <a
+                                            target="_blank"
+                                            href=https://docs.nmrxiv.org/FAQs.html
                                             class="text-base text-gray-500 hover:text-gray-900"
                                         >
-                                            Spectra
-                                        </Link>
+                                            FAQs
+                                        </a>
                                     </li>
                                 </ul>
                             </div>
@@ -829,6 +838,7 @@ import {
 } from "@heroicons/vue/24/outline";
 import { ChevronDownIcon } from "@heroicons/vue/24/solid";
 import ToolTip from "@/Shared/ToolTip.vue";
+import FAQs from "@/App/FAQs.vue";
 
 const Search = [
     {
@@ -889,6 +899,14 @@ const features = [
     },
 ];
 const footerNavigation = {
+    // Search: [
+    //   { name: "Browse", href: "/projects" },
+    //   { name: "Advanced Search", href: "/projects" },
+    // ],
+    quicklinks: [
+        { name: "Projects", href: "/projects"},
+        { name: "Spectra", href: "/spectra"}
+    ],
     support: [
         { name: "Documentation", href: "https://docs.nmrxiv.org" },
         {
@@ -956,6 +974,7 @@ export default {
         CircleStackIcon,
         ToolTip,
         Projects,
+        FAQs,
     },
 
     props: {
diff --git a/resources/js/Shared/Children.vue b/resources/js/Shared/Children.vue
index 01852616..f5b70370 100644
--- a/resources/js/Shared/Children.vue
+++ b/resources/js/Shared/Children.vue
@@ -19,10 +19,10 @@
                     ]"
                     @click.stop="displaySelected(file)"
                 >
-                    <DisclosureButton>
+                    <DisclosureButton class="w-full text-left truncate ...">
                         <span v-if="file.loading">
                             <svg
-                                class="animate-spin mr-3 ml-1 h-5 w-5 text-dark"
+                                class="animate-spin mr-3 ml-1 h-5 w-5 text-dark inline"
                                 xmlns="http://www.w3.org/2000/svg"
                                 fill="none"
                                 viewBox="0 0 24 24"
@@ -59,24 +59,24 @@
                                 />
                             </svg>
                         </span>
-                    </DisclosureButton>
-                    <span
-                        :class="[
-                            file.status == 'missing' ? 'text-red-800' : '',
-                        ]"
-                    >
                         <span
-                            v-if="file.type == 'directory'"
-                            v-html="composeIcon(file)"
-                        ></span>
-                        <span v-else>
-                            <FolderIcon
-                                class="inline -ml-1.5 mr-1 h-5 w-5 text-gray-700"
-                                aria-hidden="true"
-                            />
+                            :class="[
+                                file.status == 'missing' ? 'text-red-800' : '',
+                            ]"
+                        >
+                            <span
+                                v-if="file.type == 'directory'"
+                                v-html="composeIcon(file)"
+                            ></span>
+                            <span v-else>
+                                <FolderIcon
+                                    class="inline -ml-1.5 mr-1 h-5 w-5 text-gray-700"
+                                    aria-hidden="true"
+                                />
+                            </span>
+                            {{ file.name }}
                         </span>
-                        {{ file.name }}
-                    </span>
+                    </DisclosureButton>
                 </div>
                 <DisclosurePanel class="space-y-1">
                     <span v-for="sfile in file.children" :key="sfile.name">
@@ -113,10 +113,12 @@
                                                     displaySelected(sfile)
                                                 "
                                             >
-                                                <DisclosureButton>
+                                                <DisclosureButton
+                                                    class="w-full text-left truncate ..."
+                                                >
                                                     <span v-if="sfile.loading">
                                                         <svg
-                                                            class="animate-spin ml-1 mr-3 h-5 w-5 text-dark"
+                                                            class="animate-spin ml-1 mr-3 h-5 w-5 text-dark inline"
                                                             xmlns="http://www.w3.org/2000/svg"
                                                             fill="none"
                                                             viewBox="0 0 24 24"
@@ -142,7 +144,7 @@
                                                                 open
                                                                     ? 'text-gray-700 rotate-90'
                                                                     : 'text-gray-300',
-                                                                'mr-2 -mt-2 inline flex-shrink-0 h-5 w-5 transform group-hover:text-gray-700 transition-colors ease-in-out duration-150',
+                                                                'mr-2 flex-shrink-0 inline h-5 w-5 transform group-hover:text-gray-700 transition-colors ease-in-out duration-150',
                                                             ]"
                                                             viewBox="0 0 20 20"
                                                             aria-hidden="true"
@@ -159,7 +161,8 @@
                                                                 sfile.status ==
                                                                 'missing'
                                                                     ? 'text-red-800'
-                                                                    : 'ellipsis',
+                                                                    : '',
+                                                                '',
                                                             ]"
                                                             style="
                                                                 user-select: none;
diff --git a/resources/js/Shared/SpectraEditor.vue b/resources/js/Shared/SpectraEditor.vue
index bc4bf36a..ca68d9eb 100644
--- a/resources/js/Shared/SpectraEditor.vue
+++ b/resources/js/Shared/SpectraEditor.vue
@@ -407,7 +407,6 @@ export default {
                     }
                 }
                 if (data && data.source == "data") {
-                    // console.log(type)
                     if (
                         e.origin != "https://nmriumdev.nmrxiv.org" &&
                         e.origin != "https://nmrium.nmrxiv.org"
diff --git a/resources/js/Shared/StudyCard.vue b/resources/js/Shared/StudyCard.vue
index c3d124ea..114b2a3e 100644
--- a/resources/js/Shared/StudyCard.vue
+++ b/resources/js/Shared/StudyCard.vue
@@ -12,7 +12,12 @@
                         <div
                             class="bg-white rounded-t-md flex justify-center items-center"
                         >
-                            <span>
+                            <span
+                                v-if="
+                                    study.molecules[0] &&
+                                    study.molecules[0].CANONICAL_SMILES
+                                "
+                            >
                                 <Depictor2D
                                     class="py-2"
                                     :molecule="
@@ -21,6 +26,20 @@
                                     :show-download="false"
                                 ></Depictor2D>
                             </span>
+                            <span v-else>
+                                <div class="h-64">
+                                    <div
+                                        class="absolute inset-0 flex items-center justify-center"
+                                    >
+                                        <h2 class="text-gray-200 font-bold">
+                                            <i
+                                                >-- molecule(s) information
+                                                missing --</i
+                                            >
+                                        </h2>
+                                    </div>
+                                </div>
+                            </span>
                         </div>
                     </li>
                 </ul>
diff --git a/resources/js/Shared/StudyCardPublic.vue b/resources/js/Shared/StudyCardPublic.vue
index 36f08a73..8b481509 100644
--- a/resources/js/Shared/StudyCardPublic.vue
+++ b/resources/js/Shared/StudyCardPublic.vue
@@ -32,7 +32,7 @@
                 <div class="bg-white"></div>
             </div>
             <div
-                class="flex-1 border-t bg-white p-3 flex flex-col justify-between"
+                class="flex-1 bg-white p-3 border-t mt-1 flex flex-col justify-between"
             >
                 <div>
                     <small
diff --git a/resources/js/Shared/StudyInfo.vue b/resources/js/Shared/StudyInfo.vue
index a385113c..856bd6d8 100644
--- a/resources/js/Shared/StudyInfo.vue
+++ b/resources/js/Shared/StudyInfo.vue
@@ -10,13 +10,13 @@
                         class="bg-white rounded-t-md flex justify-center items-center"
                     >
                         <span>
-                            <Depictor
+                            <Depictor2D
                                 class="py-2"
-                                :model-value="
+                                :molecule="
                                     study.sample.molecules[0].CANONICAL_SMILES
                                 "
                                 :show-download="false"
-                            ></Depictor>
+                            ></Depictor2D>
                         </span>
                     </div>
                 </li>
@@ -108,7 +108,7 @@ import {
     EnvelopeIcon,
 } from "@heroicons/vue/24/solid";
 import { Link } from "@inertiajs/vue3";
-import Depictor from "@/Shared/Depictor.vue";
+import Depictor2D from "@/Shared/Depictor2D.vue";
 
 export default {
     components: {
@@ -118,7 +118,7 @@ export default {
         PencilIcon,
         StarIcon,
         Link,
-        Depictor,
+        Depictor2D,
     },
     props: ["study"],
     setup() {},
@@ -135,9 +135,6 @@ export default {
                 );
                 return mol.toSVG(200, 200);
             }
-            //  else {
-            //     console.log(molecule);
-            // }
         },
     },
 };
diff --git a/resources/js/Shared/Submission.vue b/resources/js/Shared/Submission.vue
index 4b5ac78a..9860b3e8 100644
--- a/resources/js/Shared/Submission.vue
+++ b/resources/js/Shared/Submission.vue
@@ -1989,8 +1989,6 @@ export default {
                     "\n  " + molecule.MOL.replaceAll('"', "")
                 );
                 return mol.toSVG(200, 200);
-            } else {
-                console.log(molecule);
             }
         },
         autoGenerateDescription() {
diff --git a/resources/ops/docker/app/app.dockerfile b/resources/ops/docker/app/app.dockerfile
index 1ab67b31..eda6cacb 100644
--- a/resources/ops/docker/app/app.dockerfile
+++ b/resources/ops/docker/app/app.dockerfile
@@ -11,7 +11,8 @@ RUN docker-php-ext-install sockets
 RUN pecl install apcu
 RUN docker-php-ext-enable apcu
 RUN docker-php-ext-install pcntl
-RUN apk update && apk add postgresql-client
+#RUN apk update && apk add postgresql-client
+RUN apk --update add postgresql15-client --repository=https://dl-cdn.alpinelinux.org/alpine/edge/main
 
 RUN set -ex \
   && apk --no-cache add \
diff --git a/routes/web.php b/routes/web.php
index bd1b46b9..6770bf8b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -39,24 +39,24 @@
 });
 
 Route::get('/', function () {
-    if (Auth::check()) {
-        return redirect()->route('dashboard');
-    } else {
-        return Inertia::render('Welcome', [
-            'spectra' => Cache::rememberForever('stats.spectra', function () {
-                return Dataset::where('is_public', true)->get()->count();
-            }),
-            'projects' => Cache::rememberForever('stats.projects', function () {
-                return Project::where('is_public', true)->get()->count();
-            }),
-            'compounds' => Cache::rememberForever('stats.compounds', function () {
-                return Molecule::whereNotNull('identifier')->get()->count();
-            }),
-            'techniques' => Cache::rememberForever('stats.techniques', function () {
-                return Dataset::where('is_public', true)->get()->unique('type')->count();
-            }),
-        ]);
-    }
+    // if (Auth::check()) {
+    //     return redirect()->route('dashboard');
+    // } else {
+    return Inertia::render('Welcome', [
+        'spectra' => Cache::rememberForever('stats.spectra', function () {
+            return Dataset::where('is_public', true)->get()->count();
+        }),
+        'projects' => Cache::rememberForever('stats.projects', function () {
+            return Project::where('is_public', true)->get()->count();
+        }),
+        'compounds' => Cache::rememberForever('stats.compounds', function () {
+            return Molecule::whereNotNull('identifier')->get()->count();
+        }),
+        'techniques' => Cache::rememberForever('stats.techniques', function () {
+            return Dataset::where('is_public', true)->get()->unique('type')->count();
+        }),
+    ]);
+    // }
 })->name('welcome');
 
 Route::supportBubble();