diff --git a/resources/views/components/layout/sidebar-group.blade.php b/resources/views/components/layout/sidebar-group.blade.php
index 15cdd820..94c69b15 100644
--- a/resources/views/components/layout/sidebar-group.blade.php
+++ b/resources/views/components/layout/sidebar-group.blade.php
@@ -11,7 +11,7 @@ class="btn btn--light btn--sm btn--icon block-navigation__toggle"
             <x-root::icon name="chevron-down" class="btn__icon" />
         </button>
     </h3>
-    <nav class="block-navigation__menu block-navigation__menu--breakout" x-bind:class="{ 'is-open': open }">
+    <nav class="block-navigation__menu block-navigation__menu--breakout" x-bind:data-state="open ? 'open' : 'closed'">
         <ul>
             @foreach($items as $item)
                 <li>
diff --git a/src/Fields/BelongsToMany.php b/src/Fields/BelongsToMany.php
index 4fa2b08e..abf4f6d7 100644
--- a/src/Fields/BelongsToMany.php
+++ b/src/Fields/BelongsToMany.php
@@ -80,7 +80,7 @@ public function fields(Request $request): array
                             $this->getRelation($model->pivotParent)->select($query->getModel()->getQualifiedKeyName())
                         );
                     });
-            })->display(function (Model $model): mixed {
+            })->display(function (Model $model): ?string {
                 return $this->resolveDisplay($model);
             }),
         ];
diff --git a/src/Fields/File.php b/src/Fields/File.php
index 9c3c275c..a3218f72 100644
--- a/src/Fields/File.php
+++ b/src/Fields/File.php
@@ -97,7 +97,7 @@ public function collection(string $value): static
     /**
      * {@inheritdoc}
      */
-    public function resolveDisplay(Model $related): mixed
+    public function resolveDisplay(Model $related): ?string
     {
         if (is_null($this->displayResolver)) {
             $this->display(function (Medium $related): string {
@@ -141,12 +141,9 @@ public function storeUsing(Closure $callback): static
      */
     public function store(Request $request, Model $model, UploadedFile $file): array
     {
-        $disk = Storage::build([
-            'driver' => 'local',
-            'root' => Config::get('root.media.tmp_dir'),
-        ]);
+        $disk = Storage::build(Config::get('root.media.tmp_dir'));
 
-        $disk->put($file->getClientOriginalName(), $file);
+        $disk->putFileAs('', $file, $file->getClientOriginalName());
 
         return $this->stored($request, $model, $disk->path($file->getClientOriginalName()));
     }
@@ -170,6 +167,7 @@ protected function stored(Request $request, Model $model, string $path): array
 
         /** @var \Illuminate\Foundation\Auth\User&\Cone\Root\Interfaces\Models\User $user */
         $user = $request->user();
+
         $user->uploads()->save($medium);
 
         MoveFile::withChain($medium->convertible() ? [new PerformConversions($medium)] : [])
@@ -254,7 +252,9 @@ public function toOption(Request $request, Model $model, Model $related): array
             'fileName' => $related->file_name,
             'isImage' => $related->isImage,
             'processing' => false,
-            'url' => $related->hasConversion('thumbnail') ? $related->getUrl('thumbnail') : $related->getUrl(),
+            'url' => ! is_null($this->displayConversion) && $related->hasConversion($this->displayConversion)
+                ? $related->getUrl($this->displayConversion)
+                : $related->getUrl(),
             'uuid' => $related->uuid,
         ]);
     }
diff --git a/src/Fields/Relation.php b/src/Fields/Relation.php
index b17ad16e..dfd5b005 100644
--- a/src/Fields/Relation.php
+++ b/src/Fields/Relation.php
@@ -291,7 +291,7 @@ public function display(Closure|string $callback): static
     /**
      * Resolve the display format or the query result.
      */
-    public function resolveDisplay(Model $related): mixed
+    public function resolveDisplay(Model $related): ?string
     {
         if (is_null($this->displayResolver)) {
             $this->display($related->getKeyName());
diff --git a/tests/Fields/FileTest.php b/tests/Fields/FileTest.php
new file mode 100644
index 00000000..8e847de1
--- /dev/null
+++ b/tests/Fields/FileTest.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Cone\Root\Tests\Fields;
+
+use Cone\Root\Fields\File;
+use Cone\Root\Tests\TestCase;
+use Cone\Root\Tests\User;
+use Illuminate\Http\Request;
+use Illuminate\Http\UploadedFile;
+
+class FileTest extends TestCase
+{
+    protected File $field;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->field = new File('Documents');
+    }
+
+    public function test_a_file_field_has_file_template(): void
+    {
+        $this->assertSame('root::fields.file', $this->field->getTemplate());
+    }
+
+    public function test_a_file_field_stores_files(): void
+    {
+        $user = User::factory()->create();
+
+        $file = UploadedFile::fake()->image('cert.png');
+
+        $this->app['request']->setUserResolver(fn () => $user);
+        $this->app['request']->files->add(['documents' => $file]);
+
+        $this->field->collection('documents');
+        $this->field->persist($this->app['request'], $user, []);
+
+        $user->save();
+
+        $this->assertTrue($user->refresh()->documents->where('file_name', 'cert.png')->isNotEmpty());
+    }
+}
diff --git a/tests/User.php b/tests/User.php
index be5a5795..429215f7 100644
--- a/tests/User.php
+++ b/tests/User.php
@@ -10,6 +10,7 @@
 use Database\Factories\UserFactory;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Database\Eloquent\Relations\HasOne;
+use Illuminate\Database\Eloquent\Relations\MorphToMany;
 
 class User extends Model implements MustVerifyEmail, RootUser
 {
@@ -29,4 +30,9 @@ public function latestUpload(): HasOne
     {
         return $this->uploads()->one()->ofMany();
     }
+
+    public function documents(): MorphToMany
+    {
+        return $this->media()->withPivotValue('collection', 'documents');
+    }
 }