diff --git a/src/app/[stream]/podcasts/podcastCard.tsx b/src/app/[stream]/podcasts/podcastCard.tsx
index d76b33d..878e612 100644
--- a/src/app/[stream]/podcasts/podcastCard.tsx
+++ b/src/app/[stream]/podcasts/podcastCard.tsx
@@ -3,7 +3,8 @@
 import Image from 'next/image';
 import { PodcastDto } from '@/common/dtos/podcastDto';
 import { useState } from 'react';
-import DownloadButton from '@/app/common/components/buttons/DownloadButton';
+import DownloadIconButton from '@/app/common/components/buttons/downloadIconButton';
+import LinkIconButton from '@/app/common/components/buttons/linkIconButton';
 
 export default function PodcastCard({
     imageUrl,
@@ -39,20 +40,34 @@ export default function PodcastCard({
                 </button>
                 <div className="mt-2 text-sm text-gray-500">
                     <p>By: {author}</p>
-                    <p>Uploaded: {uploadDate}</p>
+                    <p>Uploaded: {uploadDate ?
+                        new Date(Number(uploadDate)).toLocaleDateString("en-US", {
+                            year: "numeric",
+                            month: "long",
+                            day: "numeric"
+                        }) : "Unknown"}</p>
                 </div>
                 <div className="flex">
+                    {url &&
+                        <LinkIconButton
+                            href={url}
+                            iconSrc={`${process.env.NEXT_PUBLIC_API_BASE_URL}/icons/play.svg`}
+                            iconAlt="Listen Now"
+                            text="Listen Now"
+                            className="mt-4"
+                        />
+                    }
                     <a href={url} target="_blank" rel="noopener noreferrer" className="mt-4 text-blue-500 hover:underline text-sm">
-                        Listen Now
+                        
                     </a>
                     {url &&
-                        <DownloadButton
+                        <DownloadIconButton
                             href={url}
                             iconSrc={`${process.env.NEXT_PUBLIC_API_BASE_URL}/icons/download.svg`}
                             iconAlt="Download"
                             text="Download"
                             download={`${title}-${url.split('/').pop()}`}
-                            className="mt-4 ml-2"
+                            className="mt-4"
                             debounceMs={2000}
                         />
                     }
diff --git a/src/app/[stream]/podcasts/podcastList.tsx b/src/app/[stream]/podcasts/podcastList.tsx
index 6dad439..7daf902 100644
--- a/src/app/[stream]/podcasts/podcastList.tsx
+++ b/src/app/[stream]/podcasts/podcastList.tsx
@@ -2,8 +2,8 @@
 
 import PodcastCard from './podcastCard';
 import { useEffect, useState } from 'react';
-import { PodcastDto } from '../../../common/dtos/podcastDto';
-import AddPodcastCard from './addPodcastCard';
+import { PodcastDto } from '@/common/dtos/podcastDto';
+import AddButton from '@/app/common/components/buttons/addButton';
 
 type PodcastListProps = {
     stream?: string | string[];
@@ -20,7 +20,7 @@ export default function PodcastList({ stream }: PodcastListProps) {
 
     return (
         <div className="max-w-[800px] mx-auto w-full px-4">
-            <AddPodcastCard stream={stream}/>
+            <AddButton stream={stream} />
             {
                 podcastData.map((podcast, index) => (
                     <div key={index} className="flex justify-center">
diff --git a/src/app/[stream]/podcasts/addPodcastCard.tsx b/src/app/common/components/buttons/addButton.tsx
similarity index 93%
rename from src/app/[stream]/podcasts/addPodcastCard.tsx
rename to src/app/common/components/buttons/addButton.tsx
index 8812e60..cb9e530 100644
--- a/src/app/[stream]/podcasts/addPodcastCard.tsx
+++ b/src/app/common/components/buttons/addButton.tsx
@@ -3,7 +3,7 @@
 import { useRouter } from 'next/navigation';
 import { useState, useEffect } from 'react';
 
-export default function AddPodcastCard({ stream }: { stream?: string | string[] }) {
+export default function AddButton({ stream }: { stream?: string | string[] }) {
     const router = useRouter(),
         defaultBottomOffset = 16,
         [bottomOffset, setBottomOffset] = useState(defaultBottomOffset);
diff --git a/src/app/common/components/buttons/DownloadButton.tsx b/src/app/common/components/buttons/downloadIconButton.tsx
similarity index 86%
rename from src/app/common/components/buttons/DownloadButton.tsx
rename to src/app/common/components/buttons/downloadIconButton.tsx
index 66e8c76..b102c4f 100644
--- a/src/app/common/components/buttons/DownloadButton.tsx
+++ b/src/app/common/components/buttons/downloadIconButton.tsx
@@ -1,8 +1,8 @@
 "use client";
 
-import IconExpandTextButton from "./IconExpandTextButton";
+import IconExpandTextButton from "./iconExpandTextButton";
 
-type DownloadButtonProps = {
+type DownloadIconButtonProps = {
     href: string;
     iconSrc: string;
     iconAlt?: string;
@@ -13,7 +13,7 @@ type DownloadButtonProps = {
     disabled?: boolean;
 };
 
-export default function DownloadButton({
+export default function DownloadIconButton({
     href,
     iconSrc,
     iconAlt = "icon",
@@ -22,7 +22,7 @@ export default function DownloadButton({
     className = "",
     debounceMs,
     disabled = false
-}: DownloadButtonProps) {
+}: DownloadIconButtonProps) {
     const onClick = (e: React.MouseEvent<HTMLAnchorElement>) => {
         e.preventDefault();
         if (disabled) return;
diff --git a/src/app/common/components/buttons/linkIconButton.tsx b/src/app/common/components/buttons/linkIconButton.tsx
new file mode 100644
index 0000000..29d9d47
--- /dev/null
+++ b/src/app/common/components/buttons/linkIconButton.tsx
@@ -0,0 +1,42 @@
+"use client";
+
+import IconExpandTextButton from "./iconExpandTextButton";
+import { useRouter } from "next/navigation";
+
+type LinkIconButtonProps = {
+    href: string;
+    iconSrc: string;
+    iconAlt?: string;
+    text: string;
+    className?: string;
+    debounceMs?: number;
+    disabled?: boolean;
+};
+
+export default function LinkIconButton({
+    href,
+    iconSrc,
+    iconAlt = "icon",
+    text,
+    className = "",
+    debounceMs,
+    disabled = false
+}: LinkIconButtonProps) {
+    const router = useRouter(),
+        onClick = (e: React.MouseEvent<HTMLAnchorElement>) => {
+            e.preventDefault();
+            if (disabled || href == null) return;
+            router.push(href);
+        };
+    return (
+        <IconExpandTextButton
+            iconSrc={iconSrc}
+            iconAlt={iconAlt}
+            text={text}
+            className={className}
+            debounceMs={debounceMs}
+            disabled={disabled}
+            onClick={onClick}
+        />
+    );
+}
\ No newline at end of file
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 2cd2b51..66911d2 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -79,7 +79,7 @@ export default function Home() {
         <div className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-6 gap-6">
           {podcasts.map(podcast => (
             <button
-              key={podcast.streamId}
+              key={podcast.podcastId}
               type='button'
               onClick={() => handlePodcastClick(podcast)}
               className="aspect-square bg-purple-100 rounded-lg flex items-center justify-center overflow-hidden shadow focus:outline-none focus:ring-2 focus:ring-purple-400 transition"
diff --git a/src/pages/api/[stream]/podcasts.ts b/src/pages/api/[stream]/podcasts.ts
index d88b996..3dbfa2a 100644
--- a/src/pages/api/[stream]/podcasts.ts
+++ b/src/pages/api/[stream]/podcasts.ts
@@ -9,7 +9,9 @@ import { preparePodcastItem } from '../../../common/helpers/data';
 
 const get = async (req: NextApiRequest, res: NextApiResponse<PodcastDto[]>) => {
   const stream = req.query.stream as string,
-    podcasts = (await getPodcasts(stream as string)).map(preparePodcastItem);
+    podcasts = (await getPodcasts(stream as string))
+      .map(preparePodcastItem)
+      .sort((a, b) => Number(b.uploadDate) - Number(a.uploadDate));
 
   res.status(200).json(podcasts);
 };