diff --git a/resources/views/components/inputs/image.blade.php b/resources/views/components/inputs/image.blade.php
index d8a327b..d18fad7 100644
--- a/resources/views/components/inputs/image.blade.php
+++ b/resources/views/components/inputs/image.blade.php
@@ -4,10 +4,10 @@
         <a href="{{ $model->getFirstMedia()->getFullUrl() }}" target="_blank">
             {{ $model->getFirstMedia()($previewName) }}
         </a>
-        <fieldset class="flex space-x-2 mt-1 items-center">
-            <x-inputs.label for="remove_image" class="text-red-800" value="Remove this image" />
+        <x-inputs.label class="inline-flex items-center">
             <x-inputs.input type="checkbox" name="remove_image" value="1" />
-        </fieldset>
+            <span class="ml-2 text-red-800">Remove this image</span>
+        </x-inputs.label>
     </div>
 @endif
 <div>
diff --git a/resources/views/goals/edit.blade.php b/resources/views/goals/edit.blade.php
index 85ee4ba..12467db 100644
--- a/resources/views/goals/edit.blade.php
+++ b/resources/views/goals/edit.blade.php
@@ -8,6 +8,18 @@
         @if ($goal->exists)@method('put')@endif
         @csrf
         <div class="flex flex-col space-y-4">
+            <div class="flex flex-col space-y-4 md:flex-row md:space-x-4 md:space-y-0">
+                <!-- Name -->
+                <div class="flex-auto">
+                    <x-inputs.label for="name" value="Name" />
+
+                    <x-inputs.input name="name"
+                                    type="text"
+                                    class="block mt-1 w-full"
+                                    :value="old('name', $goal->name)"
+                                    required />
+                </div>
+            </div>
             <div class="flex flex-col space-y-4 md:flex-row md:space-x-4 md:space-y-0">
                 <!-- From -->
                 <div class="flex-auto">
@@ -29,29 +41,6 @@
                                     :hasError="$errors->has('to')" />
                 </div>
 
-                <!-- Frequency -->
-                <div class="flex-auto">
-                    <x-inputs.label for="frequency" value="Frequency" />
-                    <x-inputs.select name="frequency"
-                                     class="block w-full"
-                                     :options="$frequencyOptions"
-                                     :selectedValue="old('frequency', $goal->frequency)"
-                                     :hasError="$errors->has('frequency')">
-                    </x-inputs.select>
-                </div>
-
-                <!-- Trackable -->
-                <div class="flex-auto">
-                    <x-inputs.label for="name" value="Trackable" />
-                    <x-inputs.select name="name"
-                                     class="block w-full"
-                                     :options="$nameOptions"
-                                     :selectedValue="old('name', $goal->name)"
-                                     :hasError="$errors->has('name')"
-                                     required>
-                    </x-inputs.select>
-                </div>
-
                 <!-- Goal -->
                 <div class="flex-auto">
                     <x-inputs.label for="goal" value="Goal" />
diff --git a/resources/views/journal-entries/create.blade.php b/resources/views/journal-entries/create.blade.php
index a3b22dd..b1be738 100644
--- a/resources/views/journal-entries/create.blade.php
+++ b/resources/views/journal-entries/create.blade.php
@@ -23,10 +23,10 @@
                 </svg>
             </x-inputs.icon-green>
             <div class="flex items-center justify-end mt-4 space-x-4">
-                <fieldset class="flex space-x-2">
-                    <x-inputs.input name="group_entries" type="checkbox" class="h-5 w-5" value="1" />
-                    <x-inputs.label for="groupEntries" value="Group entries by day and meal" />
-                </fieldset>
+                <x-inputs.label class="inline-flex items-center">
+                    <x-inputs.input type="checkbox" name="group_entries" class="h-5 w-5" value="1" />
+                    <span class="ml-2">Group entries by day and meal</span>
+                </x-inputs.label>
                 <x-inputs.button x-on:click="removeTemplate($el);">Add entries</x-inputs.button>
             </div>
         </div>