diff --git a/components/Album/component.tsx b/components/Album/component.tsx
index 44ec0136..80daa2e5 100644
--- a/components/Album/component.tsx
+++ b/components/Album/component.tsx
@@ -11,7 +11,7 @@ import { useItemTracks } from "../../api/queries/tracks";
 import { SafeAreaView, useSafeAreaFrame } from "react-native-safe-area-context";
 import FavoriteButton from "../Global/components/favorite-button";
 import { useEffect } from "react";
-import BlurhashedImage from "../Global/helpers/blurhashed-image";
+import BlurhashedImage from "../Global/components/blurhashed-image";
 
 interface AlbumProps {
     album: BaseItemDto,
diff --git a/components/Albums/component.tsx b/components/Albums/component.tsx
index f980986e..7909d260 100644
--- a/components/Albums/component.tsx
+++ b/components/Albums/component.tsx
@@ -1,7 +1,7 @@
 import { useFavoriteAlbums } from "../../api/queries/favorites";
 import { AlbumsProps } from "../types";
 import { SafeAreaView, useSafeAreaFrame } from "react-native-safe-area-context";
-import { ItemCard } from "../Global/helpers/item-card";
+import { ItemCard } from "../Global/components/item-card";
 import { FlatList, RefreshControl } from "react-native";
 
 export default function Albums({ navigation }: AlbumsProps) : React.JSX.Element {
diff --git a/components/Artist/component.tsx b/components/Artist/component.tsx
index ded78753..db2cf095 100644
--- a/components/Artist/component.tsx
+++ b/components/Artist/component.tsx
@@ -1,7 +1,7 @@
 import { ScrollView, YStack } from "tamagui";
 import { useArtistAlbums } from "../../api/queries/artist";
 import { FlatList } from "react-native";
-import { ItemCard } from "../Global/helpers/item-card";
+import { ItemCard } from "../Global/components/item-card";
 import { NativeStackNavigationProp } from "@react-navigation/native-stack";
 import { StackParamList } from "../types";
 import { H2 } from "../Global/helpers/text";
@@ -9,7 +9,7 @@ import { useState } from "react";
 import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
 import { useSafeAreaFrame } from "react-native-safe-area-context";
 import FavoriteButton from "../Global/components/favorite-button";
-import BlurhashedImage from "../Global/helpers/blurhashed-image";
+import BlurhashedImage from "../Global/components/blurhashed-image";
 
 interface ArtistProps {
     artist: BaseItemDto
diff --git a/components/Artists/component.tsx b/components/Artists/component.tsx
index 835dd557..33e433b8 100644
--- a/components/Artists/component.tsx
+++ b/components/Artists/component.tsx
@@ -2,7 +2,7 @@ import { useFavoriteArtists } from "../../api/queries/favorites";
 import { SafeAreaView, useSafeAreaFrame } from "react-native-safe-area-context";
 import React from "react";
 import { FlatList, RefreshControl } from "react-native";
-import { ItemCard } from "../Global/helpers/item-card";
+import { ItemCard } from "../Global/components/item-card";
 import { ArtistsProps } from "../types";
 
 export default function Artists({ navigation }: ArtistsProps): React.JSX.Element {
diff --git a/components/Global/helpers/blurhashed-image.tsx b/components/Global/components/blurhashed-image.tsx
similarity index 100%
rename from components/Global/helpers/blurhashed-image.tsx
rename to components/Global/components/blurhashed-image.tsx
diff --git a/components/Global/helpers/item-card.tsx b/components/Global/components/item-card.tsx
similarity index 98%
rename from components/Global/helpers/item-card.tsx
rename to components/Global/components/item-card.tsx
index 7a29b8ef..33c67d57 100644
--- a/components/Global/helpers/item-card.tsx
+++ b/components/Global/components/item-card.tsx
@@ -4,7 +4,7 @@ import { H5, Card as TamaguiCard, View } from "tamagui";
 import { BaseItemDto, ImageType } from "@jellyfin/sdk/lib/generated-client/models";
 import invert from "invert-color"
 import { Blurhash } from "react-native-blurhash"
-import { Text } from "./text";
+import { Text } from "../helpers/text";
 import BlurhashedImage from "./blurhashed-image";
 
 interface CardProps extends TamaguiCardProps {
diff --git a/components/Global/components/item.tsx b/components/Global/components/item.tsx
index e4e532e8..fb20344e 100644
--- a/components/Global/components/item.tsx
+++ b/components/Global/components/item.tsx
@@ -5,7 +5,7 @@ import { NativeStackNavigationProp } from "@react-navigation/native-stack";
 import { Separator, Spacer, useTheme, View, XStack, YStack } from "tamagui";
 import { Text } from "../helpers/text";
 import { useSafeAreaFrame } from "react-native-safe-area-context";
-import BlurhashedImage from "../helpers/blurhashed-image";
+import BlurhashedImage from "./blurhashed-image";
 import Icon from "../helpers/icon";
 import { QueuingType } from "../../../enums/queuing-type";
 import { RunTimeTicks } from "../helpers/time-codes";
@@ -79,28 +79,27 @@ export default function Item({
                     justifyContent="flex-start"
                     flex={3}
                 >
-                    <Text bold>{ item.Name ?? ""}</Text>
+                    <Text 
+                        bold
+                        lineBreakStrategyIOS="standard"
+                        numberOfLines={1}
+                    >
+                        { item.Name ?? ""}
+                    </Text>
                     { (item.Type === 'Audio' || item.Type === 'MusicAlbum') && (
-                        <Text>{ item.AlbumArtist ?? "Untitled Artist" }</Text>
+                        <Text
+                            lineBreakStrategyIOS="standard"
+                            numberOfLines={1}
+                        >
+                            { item.AlbumArtist ?? "Untitled Artist" }
+                        </Text>
                     )}
                 </YStack>
 
-                {/* Runtime ticks for Songs */}
-                <YStack 
-                    justifyContent="center" 
-                    alignItems="flex-end"
-                    flex={1}
-                >
-                    { item.Type ==='Audio' ? (
-                        <RunTimeTicks>{item.RunTimeTicks}</RunTimeTicks>
-                    ) : (
-                        <Spacer />
-                    )}
-                </YStack>
 
 
                 <XStack 
-                    justifyContent="center"
+                    justifyContent="space-between"
                     alignItems="flex-end" 
                     flex={1}
                 >
@@ -113,6 +112,12 @@ export default function Item({
                     ) : (
                         <Spacer />
                     )}
+                    {/* Runtime ticks for Songs */}
+                    { item.Type ==='Audio' ? (
+                        <RunTimeTicks>{item.RunTimeTicks}</RunTimeTicks>
+                    ) : (
+                        <Spacer />
+                    )}
 
                     <Icon 
                         small 
diff --git a/components/Global/components/track.tsx b/components/Global/components/track.tsx
index 8b8d8b2f..40b8e025 100644
--- a/components/Global/components/track.tsx
+++ b/components/Global/components/track.tsx
@@ -9,7 +9,7 @@ import Icon from "../helpers/icon";
 import { NativeStackNavigationProp } from "@react-navigation/native-stack";
 import { StackParamList } from "../../../components/types";
 import { QueuingType } from "../../../enums/queuing-type";
-import BlurhashedImage from "../helpers/blurhashed-image";
+import BlurhashedImage from "./blurhashed-image";
 
 interface TrackProps {
     track: BaseItemDto;
diff --git a/components/Home/helpers/playlists.tsx b/components/Home/helpers/playlists.tsx
index 5a096026..3f09c4d8 100644
--- a/components/Home/helpers/playlists.tsx
+++ b/components/Home/helpers/playlists.tsx
@@ -1,6 +1,6 @@
 import { NativeStackNavigationProp } from "@react-navigation/native-stack";
 import { useUserPlaylists } from "../../../api/queries/playlist";
-import { ItemCard } from "../../../components/Global/helpers/item-card";
+import { ItemCard } from "../../Global/components/item-card";
 import { H2 } from "../../../components/Global/helpers/text";
 import { StackParamList } from "../../../components/types";
 import React from "react";
diff --git a/components/Home/helpers/recent-artists.tsx b/components/Home/helpers/recent-artists.tsx
index f6d5fadd..47fc14ff 100644
--- a/components/Home/helpers/recent-artists.tsx
+++ b/components/Home/helpers/recent-artists.tsx
@@ -4,7 +4,7 @@ import { useHomeContext } from "../provider";
 import { H2 } from "../../Global/helpers/text";
 import { StackParamList } from "../../types";
 import { FlatList } from "react-native";
-import { ItemCard } from "../../Global/helpers/item-card";
+import { ItemCard } from "../../Global/components/item-card";
 import { NativeStackNavigationProp } from "@react-navigation/native-stack";
 
 export default function RecentArtists({ navigation }: { navigation: NativeStackNavigationProp<StackParamList>}): React.JSX.Element {
diff --git a/components/Home/helpers/recently-played.tsx b/components/Home/helpers/recently-played.tsx
index 5099cb07..1e5e49e2 100644
--- a/components/Home/helpers/recently-played.tsx
+++ b/components/Home/helpers/recently-played.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import { ScrollView, View } from "tamagui";
 import { useHomeContext } from "../provider";
 import { H2 } from "../../Global/helpers/text";
-import { ItemCard } from "../../Global/helpers/item-card";
+import { ItemCard } from "../../Global/components/item-card";
 import { usePlayerContext } from "../../../player/provider";
 import { StackParamList } from "../../../components/types";
 import { NativeStackNavigationProp } from "@react-navigation/native-stack";
diff --git a/components/ItemDetail/component.tsx b/components/ItemDetail/component.tsx
index 07abc482..402462a0 100644
--- a/components/ItemDetail/component.tsx
+++ b/components/ItemDetail/component.tsx
@@ -4,7 +4,7 @@ import { useSafeAreaFrame } from "react-native-safe-area-context";
 import { StackParamList } from "../types";
 import TrackOptions from "./helpers/TrackOptions";
 import { ScrollView, Spacer, useTheme, View, XStack, YStack } from "tamagui";
-import BlurhashedImage from "../Global/helpers/blurhashed-image";
+import BlurhashedImage from "../Global/components/blurhashed-image";
 import { Text } from "../Global/helpers/text";
 import FavoriteButton from "../Global/components/favorite-button";
 import { useEffect } from "react";
diff --git a/components/Player/mini-player.tsx b/components/Player/mini-player.tsx
index 5a4660e1..adf50a0e 100644
--- a/components/Player/mini-player.tsx
+++ b/components/Player/mini-player.tsx
@@ -9,7 +9,7 @@ import TextTicker from 'react-native-text-ticker';
 import PlayPauseButton from "./helpers/buttons";
 import { useSafeAreaFrame } from "react-native-safe-area-context";
 import { TextTickerConfig } from "./component.config";
-import BlurhashedImage from "../Global/helpers/blurhashed-image";
+import BlurhashedImage from "../Global/components/blurhashed-image";
 
 export function Miniplayer({ navigation }: { navigation : NavigationHelpers<ParamListBase, BottomTabNavigationEventMap> }) : React.JSX.Element {
 
diff --git a/components/Player/screens/index.tsx b/components/Player/screens/index.tsx
index 6d474d7c..f4ff97f0 100644
--- a/components/Player/screens/index.tsx
+++ b/components/Player/screens/index.tsx
@@ -10,7 +10,7 @@ import PlayPauseButton from "../helpers/buttons";
 import { H5, Text } from "../../../components/Global/helpers/text";
 import Icon from "../../../components/Global/helpers/icon";
 import FavoriteButton from "../../Global/components/favorite-button";
-import BlurhashedImage from "../../../components/Global/helpers/blurhashed-image";
+import BlurhashedImage from "../../Global/components/blurhashed-image";
 import TextTicker from "react-native-text-ticker";
 import { TextTickerConfig } from "../component.config";
 
diff --git a/components/Playlist/component.tsx b/components/Playlist/component.tsx
index d935f95b..58a4e092 100644
--- a/components/Playlist/component.tsx
+++ b/components/Playlist/component.tsx
@@ -10,7 +10,7 @@ import Track from "../Global/components/track";
 import { FlatList } from "react-native";
 import { SafeAreaView } from "react-native-safe-area-context";
 import { useEffect } from "react";
-import BlurhashedImage from "../Global/helpers/blurhashed-image";
+import BlurhashedImage from "../Global/components/blurhashed-image";
 
 interface PlaylistProps { 
     playlist: BaseItemDto;