From 873bf64a4e2baa6ccec32be3c47033405ef26946 Mon Sep 17 00:00:00 2001
From: Tobias <stbuctob@bx.fallmerayer.it>
Date: Sat, 2 Aug 2025 02:00:11 +0200
Subject: [PATCH 1/4] search bar, design update

---
 frontend/src/index.css                 | 1757 ++++++++++++++----------
 frontend/src/screens/AddSongModal.jsx  |  136 +-
 frontend/src/screens/CreateStation.jsx |  110 +-
 frontend/src/screens/Home.jsx          |   64 +-
 frontend/src/screens/JoinStation.jsx   |  110 +-
 frontend/src/screens/StationPage.jsx   |  147 +-
 frontend/src/utils/spotifyAuth.js      |   36 +
 7 files changed, 1438 insertions(+), 922 deletions(-)

diff --git a/frontend/src/index.css b/frontend/src/index.css
index 673a327..fa303ed 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -5,590 +5,794 @@
 }
 
 body {
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
-    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
-    sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-  min-height: 100vh;
-  color: #333;
-}
-
-/* Home Component Styles */
-.home-container {
-  min-height: 100vh;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 20px;
-}
-
-.content {
-  background: rgba(255, 255, 255, 0.95);
-  backdrop-filter: blur(10px);
-  border-radius: 24px;
-  padding: 40px 30px;
-  text-align: center;
-  box-shadow: 0 20px 40px rgba(0, 0, 0, 0.1);
-  border: 1px solid rgba(255, 255, 255, 0.2);
-  max-width: 500px;
-  width: 100%;
-}
-
-.title {
-  font-size: 2.5rem;
-  font-weight: 700;
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-  -webkit-background-clip: text;
-  -webkit-text-fill-color: transparent;
-  background-clip: text;
-  margin-bottom: 12px;
-  line-height: 1.2;
-}
-
-.subtitle {
-  font-size: 1.1rem;
-  color: #666;
-  margin-bottom: 40px;
-  line-height: 1.5;
-}
-
-.button-container {
-  display: flex;
-  flex-direction: column;
-  gap: 16px;
-}
-
-.action-button {
-  padding: 16px 32px;
-  border: none;
-  border-radius: 12px;
-  font-size: 1.1rem;
-  font-weight: 600;
-  cursor: pointer;
-  transition: all 0.3s ease;
-  text-decoration: none;
-  display: inline-block;
-  position: relative;
-  overflow: hidden;
-}
-
-.action-button.primary {
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  font-family: 'Arial', sans-serif;
+  background: #1a1a1a;
   color: white;
-  box-shadow: 0 8px 25px rgba(102, 126, 234, 0.3);
-}
-
-.action-button.primary:hover {
-  transform: translateY(-2px);
-  box-shadow: 0 12px 35px rgba(102, 126, 234, 0.4);
-}
-
-.action-button.secondary {
-  background: white;
-  color: #667eea;
-  border: 2px solid #667eea;
-}
-
-.action-button.secondary:hover {
-  background: #667eea;
-  color: white;
-  transform: translateY(-2px);
-  box-shadow: 0 8px 25px rgba(102, 126, 234, 0.3);
-}
-
-/* Create Station Component Styles */
-.create-station {
-  min-height: 100vh;
-  padding: 20px;
-  display: flex;
-  flex-direction: column;
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-}
-
-.create-station-header {
-  text-align: center;
-  margin-bottom: 40px;
-  padding-top: 40px;
-}
-
-.create-station-header h1 {
-  font-size: 2.2rem;
-  font-weight: 700;
-  color: white;
-  margin-bottom: 20px;
-  text-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-}
-
-.create-station-content {
-  flex: 1;
-  max-width: 600px;
-  margin: 0 auto;
-  width: 100%;
-  background: rgba(255, 255, 255, 0.95);
-  backdrop-filter: blur(10px);
-  border-radius: 24px;
-  padding: 40px 30px;
-  box-shadow: 0 20px 40px rgba(0, 0, 0, 0.1);
-  border: 1px solid rgba(255, 255, 255, 0.2);
-}
-
-.join-method-section h2 {
-  font-size: 1.4rem;
-  font-weight: 600;
-  color: #333;
-  margin-bottom: 30px;
-  line-height: 1.4;
-}
-
-.radio-option {
-  margin-bottom: 24px;
-}
-
-.radio-option label {
-  display: flex;
-  align-items: center;
-  font-size: 1.1rem;
-  font-weight: 500;
-  cursor: pointer;
-  padding: 16px 20px;
-  border: 2px solid #e9ecef;
-  border-radius: 12px;
-  transition: all 0.3s ease;
-  background: white;
-}
-
-.radio-option label:hover {
-  border-color: #667eea;
-  background: #f8f9ff;
-}
-
-.radio-option input[type="radio"]:checked + label,
-.radio-option label:has(input[type="radio"]:checked) {
-  border-color: #667eea;
-  background: linear-gradient(135deg, rgba(102, 126, 234, 0.1) 0%, rgba(118, 75, 162, 0.1) 100%);
-  color: #667eea;
-}
-
-.radio-option input[type="radio"] {
-  margin-right: 12px;
-  transform: scale(1.3);
-  accent-color: #667eea;
-}
-
-.password-input-section {
-  margin-top: 30px;
-  animation: slideIn 0.3s ease;
-}
-
-@keyframes slideIn {
-  from {
-    opacity: 0;
-    transform: translateY(-10px);
-  }
-  to {
-    opacity: 1;
-    transform: translateY(0);
-  }
-}
-
-.password-input-section label {
-  display: block;
-  font-size: 1rem;
-  font-weight: 600;
-  color: #333;
-  margin-bottom: 12px;
-}
-
-.password-input-section input {
-  width: 100%;
-  padding: 16px 20px;
-  border: 2px solid #e9ecef;
-  border-radius: 12px;
-  font-size: 1rem;
-  transition: all 0.3s ease;
-  background: white;
-}
-
-.password-input-section input:focus {
-  outline: none;
-  border-color: #667eea;
-  box-shadow: 0 0 0 3px rgba(102, 126, 234, 0.1);
-}
-
-.create-station-final-btn {
-  width: 100%;
-  background: linear-gradient(135deg, #28a745 0%, #20c997 100%);
-  color: white;
-  border: none;
-  padding: 18px 32px;
-  font-size: 1.1rem;
-  font-weight: 600;
-  border-radius: 12px;
-  cursor: pointer;
-  margin-top: 40px;
-  transition: all 0.3s ease;
-  box-shadow: 0 8px 25px rgba(40, 167, 69, 0.3);
-}
-
-.create-station-final-btn:hover:not(:disabled) {
-  transform: translateY(-2px);
-  box-shadow: 0 12px 35px rgba(40, 167, 69, 0.4);
-}
-
-.create-station-final-btn:disabled {
-  background: #ccc;
-  cursor: not-allowed;
-  transform: none;
-  box-shadow: none;
-}
-
-/* Join Station Component Styles */
-.join-station {
-  min-height: 100vh;
-  padding: 20px;
-  display: flex;
-  flex-direction: column;
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-}
-
-.join-station-header {
-  text-align: center;
-  margin-bottom: 40px;
-  padding-top: 40px;
-}
-
-.join-station-header h1 {
-  font-size: 2.2rem;
-  font-weight: 700;
-  color: white;
-  margin-bottom: 20px;
-  text-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-}
-
-.join-station-content {
-  flex: 1;
-  max-width: 600px;
-  margin: 0 auto;
-  width: 100%;
-  background: rgba(255, 255, 255, 0.95);
-  backdrop-filter: blur(10px);
-  border-radius: 24px;
-  padding: 40px 30px;
-  box-shadow: 0 20px 40px rgba(0, 0, 0, 0.1);
-  border: 1px solid rgba(255, 255, 255, 0.2);
-}
-
-.verify-method-section h2 {
-  font-size: 1.4rem;
-  font-weight: 600;
-  color: #333;
-  margin-bottom: 30px;
-  line-height: 1.4;
-}
-
-.join-station-final-btn {
-  width: 100%;
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-  color: white;
-  border: none;
-  padding: 18px 32px;
-  font-size: 1.1rem;
-  font-weight: 600;
-  border-radius: 12px;
-  cursor: pointer;
-  margin-top: 40px;
-  transition: all 0.3s ease;
-  box-shadow: 0 8px 25px rgba(102, 126, 234, 0.3);
-}
-
-.join-station-final-btn:hover:not(:disabled) {
-  transform: translateY(-2px);
-  box-shadow: 0 12px 35px rgba(102, 126, 234, 0.4);
-}
-
-.join-station-final-btn:disabled {
-  background: #ccc;
-  cursor: not-allowed;
-  transform: none;
-  box-shadow: none;
-}
-
-/* Station Page Styles */
-.station-page {
-  min-height: 100vh;
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-  position: relative;
   overflow-x: hidden;
 }
 
-.animated-background {
-  position: fixed;
+.station-page-desktop {
+  min-height: 100vh;
+  position: relative;
+  display: flex;
+  flex-direction: column;
+}
+
+/* Main Layout */
+.desktop-main {
+  display: flex;
+  flex: 1;
+  padding: 40px 40px 0 40px;
+  gap: 60px;
+  max-width: 1400px;
+  margin: 0 auto;
+  width: 100%;
+  height: calc(100vh - 80px); /* Account for progress bar */
+  position: relative;
+}
+
+/* Left Section */
+.left-section {
+  flex: 0 0 400px; /* Fixed width instead of flex: 1 */
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  max-width: 400px;
+}
+
+/* Vinyl Container */
+.vinyl-container {
+  position: relative;
+  margin-bottom: 40px;
+}
+
+.vinyl-record-desktop {
+  width: 300px;
+  height: 300px;
+  background: radial-gradient(circle, #1a1a1a 30%, #333 31%, #1a1a1a 32%, #333 33%, #1a1a1a 34%);
+  border-radius: 50%;
+  position: relative;
+  box-shadow: 0 20px 40px rgba(0, 0, 0, 0.5);
+  transition: transform 0.3s ease;
+}
+
+.vinyl-record-desktop.spinning {
+  animation: spin 3s linear infinite;
+}
+
+@keyframes spin {
+  from { transform: rotate(0deg); }
+  to { transform: rotate(360deg); }
+}
+
+.vinyl-center {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 60px;
+  height: 60px;
+  background: #8B4513;
+  border-radius: 50%;
+  box-shadow: inset 0 2px 10px rgba(0, 0, 0, 0.5);
+}
+
+.vinyl-center::after {
+  content: '';
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 10px;
+  height: 10px;
+  background: #000;
+  border-radius: 50%;
+}
+
+.vinyl-grooves {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 200px;
+  height: 200px;
+  border-radius: 50%;
+  border: 2px solid transparent; /* Changed from rgba(255, 255, 255, 0.1) to transparent */
+}
+
+.vinyl-grooves::before {
+  content: '';
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  border-radius: 50%;
+  border: 1px solid transparent; /* Changed from rgba(255, 255, 255, 0.1) to transparent */
+  width: 160px;
+  height: 160px;
+}
+
+.vinyl-grooves::after {
+  content: '';
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  border-radius: 50%;
+  border: 1px solid rgba(255, 255, 255, 0.1);
+  width: 240px;
+  height: 240px;
+}
+
+/* Music Notes Animation */
+.music-notes-desktop {
+  position: absolute;
   top: 0;
   left: 0;
   width: 100%;
   height: 100%;
   pointer-events: none;
-  z-index: 1;
 }
 
-.star {
+.music-note {
   position: absolute;
-  background: rgba(255, 255, 255, 0.6);
-  border-radius: 50%;
-  animation: float 6s ease-in-out infinite;
+  font-size: 24px;
+  color: #4A90E2;
+  animation: float 3s ease-in-out infinite;
 }
 
-.star:nth-child(odd) {
-  width: 2px;
-  height: 2px;
-  animation-duration: 8s;
+.note-1 {
+  top: 20%;
+  right: -40px;
+  animation-delay: 0s;
 }
 
-.star:nth-child(even) {
-  width: 3px;
-  height: 3px;
-  animation-duration: 6s;
+.note-2 {
+  top: 50%;
+  right: -60px;
+  animation-delay: 1s;
 }
 
-.star:nth-child(3n) {
-  width: 1px;
-  height: 1px;
-  animation-duration: 10s;
+.note-3 {
+  top: 80%;
+  right: -40px;
+  animation-delay: 2s;
 }
 
-.star-1 { top: 10%; left: 20%; animation-delay: 0s; }
-.star-2 { top: 20%; left: 80%; animation-delay: 1s; }
-.star-3 { top: 30%; left: 40%; animation-delay: 2s; }
-.star-4 { top: 40%; left: 10%; animation-delay: 1.5s; }
-.star-5 { top: 50%; left: 70%; animation-delay: 3s; }
-.star-6 { top: 60%; left: 30%; animation-delay: 0.5s; }
-.star-7 { top: 70%; left: 90%; animation-delay: 2.5s; }
-.star-8 { top: 80%; left: 50%; animation-delay: 1.8s; }
-.star-9 { top: 15%; left: 60%; animation-delay: 2.2s; }
-.star-10 { top: 25%; left: 15%; animation-delay: 3.5s; }
-.star-11 { top: 35%; left: 85%; animation-delay: 0.8s; }
-.star-12 { top: 45%; left: 25%; animation-delay: 4s; }
-.star-13 { top: 55%; left: 75%; animation-delay: 1.2s; }
-.star-14 { top: 65%; left: 5%; animation-delay: 2.8s; }
-.star-15 { top: 75%; left: 95%; animation-delay: 0.3s; }
-.star-16 { top: 85%; left: 35%; animation-delay: 3.2s; }
-.star-17 { top: 5%; left: 45%; animation-delay: 1.7s; }
-.star-18 { top: 95%; left: 65%; animation-delay: 2.1s; }
-.star-19 { top: 12%; left: 2%; animation-delay: 3.8s; }
-.star-20 { top: 88%; left: 98%; animation-delay: 0.9s; }
-
 @keyframes float {
-  0%, 100% {
-    transform: translateY(0px) translateX(0px);
-    opacity: 0.6;
-  }
-  50% {
-    transform: translateY(-10px) translateX(5px);
-    opacity: 1;
-  }
+  0%, 100% { transform: translateY(0) rotate(0deg); opacity: 0; }
+  50% { transform: translateY(-30px) rotate(15deg); opacity: 1; }
 }
 
-.station-content {
-  position: relative;
-  z-index: 2;
+/* Next Song Info */
+.next-song-info {
+  text-align: center;
+  background: rgba(255, 255, 255, 0.05);
   padding: 20px;
-  max-width: 800px;
-  margin: 0 auto;
-}
-
-.station-header {
-  text-align: center;
-  margin-bottom: 40px;
-  padding-top: 40px;
-}
-
-.station-header h1 {
-  font-size: 2.5rem;
-  font-weight: 700;
-  color: white;
-  margin-bottom: 10px;
-  text-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-}
-
-.station-subtitle {
-  font-size: 1.1rem;
-  color: rgba(255, 255, 255, 0.9);
-  margin: 0;
-}
-
-.media-controls-section {
-  background: rgba(255, 255, 255, 0.95);
-  backdrop-filter: blur(10px);
-  border-radius: 20px;
-  padding: 30px;
+  border-radius: 15px;
   margin-bottom: 30px;
-  box-shadow: 0 20px 40px rgba(0, 0, 0, 0.1);
-  border: 1px solid rgba(255, 255, 255, 0.2);
+  width: 100%;
+  max-width: 300px;
 }
 
-.current-song {
-  text-align: center;
-  margin-bottom: 25px;
+.next-label {
+  font-size: 14px;
+  color: #aaa;
+  margin-bottom: 8px;
+  text-transform: uppercase;
+  letter-spacing: 1px;
 }
 
-.current-song h3 {
-  font-size: 1.4rem;
-  font-weight: 600;
-  color: #333;
+.next-song-info h4 {
+  font-size: 18px;
   margin-bottom: 5px;
+  color: #4A90E2;
 }
 
-.current-song p {
-  font-size: 1rem;
-  color: #666;
-  margin: 0;
+.next-artist {
+  font-size: 14px;
+  color: #ccc;
 }
 
-.media-controls {
+/* Bottom Play Icon */
+.bottom-play-icon {
   display: flex;
   justify-content: center;
-  align-items: center;
-  gap: 20px;
 }
 
-.control-btn {
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-  border: none;
-  border-radius: 50%;
-  width: 50px;
-  height: 50px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  cursor: pointer;
-  transition: all 0.3s ease;
-  color: white;
-  box-shadow: 0 4px 15px rgba(102, 126, 234, 0.3);
-}
-
-.control-btn.play-pause {
+.mini-play-btn {
   width: 60px;
   height: 60px;
-  box-shadow: 0 6px 20px rgba(102, 126, 234, 0.4);
+  border: none;
+  border-radius: 50%;
+  background: linear-gradient(135deg, #4A90E2, #6BB6FF);
+  color: #fff;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  transition: all 0.3s ease;
+  box-shadow: 0 10px 20px rgba(74, 144, 226, 0.3);
 }
 
-.control-btn:hover {
-  transform: translateY(-2px);
-  box-shadow: 0 8px 25px rgba(102, 126, 234, 0.5);
+.mini-play-btn:hover {
+  transform: scale(1.1);
+  box-shadow: 0 15px 30px rgba(74, 144, 226, 0.4);
 }
 
-.songs-section {
-  background: rgba(255, 255, 255, 0.95);
+/* Right Section */
+.right-section {
+  position: absolute;
+  left: 50%;
+  top: 20px; /* Add top margin */
+  right: 20px; /* Reduced from 40px */
+  bottom: 20px; /* Add bottom margin */
+  display: flex;
+  flex-direction: column;
+}
+
+.recommendations-container {
+  background: linear-gradient(135deg, #2a2a2a 0%, #1a1a1a 50%, #0a0a0a 100%);
   backdrop-filter: blur(10px);
   border-radius: 20px;
   padding: 30px;
-  box-shadow: 0 20px 40px rgba(0, 0, 0, 0.1);
-  border: 1px solid rgba(255, 255, 255, 0.2);
+  height: 100%; /* Take full height of parent */
+  display: flex;
+  flex-direction: column;
 }
 
-.section-header {
+.recommendations-header {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  margin-bottom: 25px;
+  margin-bottom: 30px;
+  border-bottom: 2px solid rgba(74, 144, 226, 0.3);
+  padding-bottom: 15px;
 }
 
-.section-header h2 {
-  font-size: 1.5rem;
-  font-weight: 600;
-  color: #333;
-  margin: 0;
+.recommendations-header h2 {
+  font-size: 28px;
+  color: #4A90E2;
+  font-weight: bold;
 }
 
-.add-song-btn {
-  background: linear-gradient(135deg, #28a745 0%, #20c997 100%);
-  color: white;
+.add-suggestion-btn {
+  width: 50px;
+  height: 50px;
   border: none;
-  padding: 12px 20px;
-  border-radius: 10px;
-  font-size: 0.9rem;
-  font-weight: 600;
+  border-radius: 50%;
+  background: linear-gradient(135deg, #4A90E2, #6BB6FF);
+  color: #fff;
   cursor: pointer;
-  transition: all 0.3s ease;
-  box-shadow: 0 4px 15px rgba(40, 167, 69, 0.3);
-}
-
-.add-song-btn:hover {
-  transform: translateY(-2px);
-  box-shadow: 0 6px 20px rgba(40, 167, 69, 0.4);
-}
-
-.songs-list {
-  max-height: 400px;
-  overflow-y: auto;
-  margin: -5px;
-  padding: 5px;
-}
-
-.songs-list::-webkit-scrollbar {
-  width: 6px;
-}
-
-.songs-list::-webkit-scrollbar-track {
-  background: #f1f1f1;
-  border-radius: 3px;
-}
-
-.songs-list::-webkit-scrollbar-thumb {
-  background: #c1c1c1;
-  border-radius: 3px;
-}
-
-.songs-list::-webkit-scrollbar-thumb:hover {
-  background: #a8a8a8;
-}
-
-.song-item {
   display: flex;
-  justify-content: space-between;
   align-items: center;
-  padding: 15px 20px;
-  border-radius: 12px;
-  margin-bottom: 8px;
+  justify-content: center;
   transition: all 0.3s ease;
-  cursor: pointer;
-  border: 2px solid transparent;
+  box-shadow: 0 5px 15px rgba(74, 144, 226, 0.3);
 }
 
-.song-item:hover {
-  background: rgba(102, 126, 234, 0.05);
-  border-color: rgba(102, 126, 234, 0.2);
+.add-suggestion-btn:hover {
+  transform: scale(1.1);
+  box-shadow: 0 8px 20px rgba(74, 144, 226, 0.4);
+}
+
+.recommendations-list {
+  display: flex;
+  flex-direction: column;
+  gap: 15px;
+  flex: 1; /* Take remaining space */
+  overflow-y: auto;
+}
+
+.recommendations-list::-webkit-scrollbar {
+  width: 8px;
+}
+
+.recommendations-list::-webkit-scrollbar-track {
+  background: rgba(255, 255, 255, 0.1);
+  border-radius: 10px;
+}
+
+.recommendations-list::-webkit-scrollbar-thumb {
+  background: #4A90E2;
+  border-radius: 10px;
+}
+
+.recommendation-item {
+  display: flex;
+  align-items: center;
+  padding: 15px;
+  background: rgba(255, 255, 255, 0.05);
+  border-radius: 12px;
+  border: 1px solid rgba(255, 255, 255, 0.1);
+  transition: all 0.3s ease;
+  cursor: pointer;
+}
+
+.recommendation-item:hover {
+  background: rgba(255, 255, 255, 0.1);
+  transform: translateY(-2px);
+  box-shadow: 0 5px 15px rgba(0, 0, 0, 0.2);
+}
+
+.song-cover {
+  width: 60px;
+  height: 60px;
+  border-radius: 8px;
+  margin-right: 15px;
+  object-fit: cover;
+}
+
+.song-info {
+  flex: 1;
 }
 
 .song-info h4 {
-  font-size: 1rem;
-  font-weight: 600;
-  color: #333;
-  margin: 0 0 4px 0;
+  font-size: 16px;
+  margin-bottom: 5px;
+  color: white;
 }
 
-.song-info p {
-  font-size: 0.9rem;
-  color: #666;
-  margin: 0;
+.artist {
+  font-size: 14px;
+  color: #4A90E2;
+  margin-bottom: 3px;
 }
 
-.song-duration {
-  font-size: 0.9rem;
-  color: #888;
-  font-weight: 500;
+.album {
+  font-size: 12px;
+  color: #aaa;
 }
 
-/* Modal Styles */
-.modal-backdrop {
-  position: fixed;
+.duration {
+  font-size: 14px;
+  color: #ccc;
+  font-weight: bold;
+}
+
+/* Progress Container */
+.progress-container {
+  padding: 20px 40px;
+  background: rgba(0, 0, 0, 0.3);
+  backdrop-filter: blur(10px);
+  position: relative;
+  z-index: 10;
+}
+
+.progress-bar {
+  width: 100%;
+  height: 8px;
+  background: rgba(255, 255, 255, 0.2);
+  border-radius: 4px;
+  overflow: hidden;
+  position: relative;
+}
+
+.progress-fill {
+  height: 100%;
+  background: linear-gradient(90deg, #4A90E2, #6BB6FF);
+  border-radius: 4px;
+  transition: width 0.3s ease;
+  box-shadow: 0 0 10px rgba(74, 144, 226, 0.5);
+}
+
+/* Home Page Styles */
+.home-container {
+  min-height: 100vh;
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  background: #1a1a1a;
+}
+
+.home-main {
+  display: flex;
+  flex: 1;
+  padding: 40px;
+  gap: 60px;
+  max-width: 1400px;
+  margin: 0 auto;
+  width: 100%;
+  height: 100vh;
+  align-items: center;
+}
+
+/* Home Left Section */
+.home-left-section {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.home-vinyl-container {
+  position: relative;
+}
+
+.home-vinyl-record {
+  width: 250px;
+  height: 250px;
+  background: radial-gradient(circle, #1a1a1a 30%, #333 31%, #1a1a1a 32%, #333 33%, #1a1a1a 34%);
+  border-radius: 50%;
+  position: relative;
+  box-shadow: 0 20px 40px rgba(0, 0, 0, 0.5);
+  animation: spin 8s linear infinite;
+}
+
+.home-music-notes {
+  position: absolute;
   top: 0;
   left: 0;
   width: 100%;
   height: 100%;
-  background: rgba(0, 0, 0, 0.5);
+  pointer-events: none;
+}
+
+.home-music-notes .music-note {
+  position: absolute;
+  font-size: 20px;
+  color: #4A90E2;
+  animation: float 4s ease-in-out infinite;
+}
+
+.home-music-notes .note-1 {
+  top: 20%;
+  right: -30px;
+  animation-delay: 0s;
+}
+
+.home-music-notes .note-2 {
+  top: 50%;
+  right: -50px;
+  animation-delay: 1.5s;
+}
+
+.home-music-notes .note-3 {
+  top: 80%;
+  right: -30px;
+  animation-delay: 3s;
+}
+
+/* Home Right Section */
+.home-right-section {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.home-content {
+  text-align: center;
+  max-width: 500px;
+  background: linear-gradient(135deg, #2a2a2a 0%, #1a1a1a 50%, #0a0a0a 100%);
+  backdrop-filter: blur(10px);
+  border-radius: 20px;
+  padding: 50px 40px;
+  border: 1px solid rgba(255, 255, 255, 0.1);
+}
+
+.home-title {
+  font-size: 48px;
+  font-weight: bold;
+  color: #4A90E2;
+  margin-bottom: 20px;
+  text-shadow: 0 2px 10px rgba(74, 144, 226, 0.3);
+}
+
+.home-subtitle {
+  font-size: 18px;
+  color: #ccc;
+  margin-bottom: 40px;
+  line-height: 1.6;
+}
+
+.home-button-container {
+  display: flex;
+  flex-direction: column;
+  gap: 20px;
+}
+
+.home-action-button {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 12px;
+  padding: 18px 30px;
+  font-size: 16px;
+  font-weight: bold;
+  border: none;
+  border-radius: 12px;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  text-transform: uppercase;
+  letter-spacing: 1px;
+  min-height: 60px;
+}
+
+.home-action-button.primary {
+  background: linear-gradient(135deg, #4A90E2, #6BB6FF);
+  color: white;
+  box-shadow: 0 10px 20px rgba(74, 144, 226, 0.3);
+}
+
+.home-action-button.primary:hover {
+  transform: translateY(-3px);
+  box-shadow: 0 15px 30px rgba(74, 144, 226, 0.4);
+}
+
+.home-action-button.secondary {
+  background: transparent;
+  color: #4A90E2;
+  border: 2px solid #4A90E2;
+  box-shadow: 0 5px 15px rgba(74, 144, 226, 0.2);
+}
+
+.home-action-button.secondary:hover {
+  background: rgba(74, 144, 226, 0.1);
+  transform: translateY(-3px);
+  box-shadow: 0 10px 25px rgba(74, 144, 226, 0.3);
+}
+
+/* Create Station Styles */
+.create-station-container {
+  min-height: 100vh;
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  background: #1a1a1a;
+}
+
+.create-station-main {
+  display: flex;
+  flex: 1;
+  padding: 40px;
+  gap: 60px;
+  max-width: 1400px;
+  margin: 0 auto;
+  width: 100%;
+  height: 100vh;
+  align-items: center;
+}
+
+/* Create Station Left Section */
+.create-station-left-section {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.create-station-vinyl-container {
+  position: relative;
+}
+
+.create-station-vinyl-record {
+  width: 280px;
+  height: 280px;
+  background: radial-gradient(circle, #1a1a1a 30%, #333 31%, #1a1a1a 32%, #333 33%, #1a1a1a 34%);
+  border-radius: 50%;
+  position: relative;
+  box-shadow: 0 20px 40px rgba(0, 0, 0, 0.5);
+  animation: spin 6s linear infinite;
+}
+
+.create-station-music-notes {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  pointer-events: none;
+}
+
+.create-station-music-notes .music-note {
+  position: absolute;
+  font-size: 24px;
+  color: #4A90E2;
+  animation: float 3s ease-in-out infinite;
+}
+
+.create-station-music-notes .note-1 {
+  top: 20%;
+  right: -40px;
+  animation-delay: 0s;
+}
+
+.create-station-music-notes .note-2 {
+  top: 50%;
+  right: -60px;
+  animation-delay: 1s;
+}
+
+.create-station-music-notes .note-3 {
+  top: 80%;
+  right: -40px;
+  animation-delay: 2s;
+}
+
+/* Create Station Right Section */
+.create-station-right-section {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.create-station-content {
+  width: 100%;
+  max-width: 500px;
+  background: linear-gradient(135deg, #2a2a2a 0%, #1a1a1a 50%, #0a0a0a 100%);
+  backdrop-filter: blur(10px);
+  border-radius: 20px;
+  padding: 40px;
+  border: 1px solid rgba(255, 255, 255, 0.1);
+  box-shadow: 0 20px 40px rgba(0, 0, 0, 0.3);
+}
+
+.create-station-header {
+  text-align: center;
+  margin-bottom: 40px;
+}
+
+.create-station-header h1 {
+  font-size: 32px;
+  font-weight: bold;
+  color: #4A90E2;
+  margin-bottom: 10px;
+  text-shadow: 0 2px 10px rgba(74, 144, 226, 0.3);
+}
+
+.create-station-form {
+  display: flex;
+  flex-direction: column;
+  gap: 30px;
+}
+
+.join-method-section h2 {
+  font-size: 18px;
+  color: #fff;
+  margin-bottom: 20px;
+  font-weight: 600;
+}
+
+.radio-option {
+  margin-bottom: 20px;
+}
+
+.radio-option label {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  cursor: pointer;
+  padding: 15px 20px;
+  background: rgba(255, 255, 255, 0.05);
+  border: 2px solid rgba(255, 255, 255, 0.1);
+  border-radius: 12px;
+  transition: all 0.3s ease;
+  font-size: 16px;
+  font-weight: 500;
+  color: #fff;
+}
+
+.radio-option label:hover {
+  background: rgba(255, 255, 255, 0.1);
+  border-color: rgba(74, 144, 226, 0.5);
+}
+
+.radio-option input[type="radio"] {
+  display: none;
+}
+
+.radio-custom {
+  width: 20px;
+  height: 20px;
+  border: 2px solid #4A90E2;
+  border-radius: 50%;
+  position: relative;
+  transition: all 0.3s ease;
+}
+
+.radio-option input[type="radio"]:checked + .radio-custom {
+  background: #4A90E2;
+  box-shadow: 0 0 10px rgba(74, 144, 226, 0.5);
+}
+
+.radio-option input[type="radio"]:checked + .radio-custom::after {
+  content: '';
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 8px;
+  height: 8px;
+  background: white;
+  border-radius: 50%;
+}
+
+.password-input-section {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+  margin-top: 20px;
+  padding: 20px;
+  background: rgba(255, 255, 255, 0.03);
+  border-radius: 12px;
+  border: 1px solid rgba(255, 255, 255, 0.1);
+}
+
+.password-input-section label {
+  font-size: 14px;
+  font-weight: 600;
+  color: #4A90E2;
+  text-transform: uppercase;
+  letter-spacing: 1px;
+}
+
+.password-input-section input {
+  padding: 15px 20px;
+  background: rgba(255, 255, 255, 0.05);
+  border: 2px solid rgba(255, 255, 255, 0.1);
+  border-radius: 10px;
+  color: #fff;
+  font-size: 16px;
+  transition: all 0.3s ease;
+}
+
+.password-input-section input:focus {
+  outline: none;
+  border-color: #4A90E2;
+  background: rgba(255, 255, 255, 0.1);
+  box-shadow: 0 0 0 3px rgba(74, 144, 226, 0.1);
+}
+
+.password-input-section input::placeholder {
+  color: #aaa;
+}
+
+.create-station-final-btn {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 12px;
+  padding: 18px 30px;
+  font-size: 16px;
+  font-weight: bold;
+  border: none;
+  border-radius: 12px;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  text-transform: uppercase;
+  letter-spacing: 1px;
+  min-height: 60px;
+  background: linear-gradient(135deg, #4A90E2, #6BB6FF);
+  color: white;
+  box-shadow: 0 10px 20px rgba(74, 144, 226, 0.3);
+  margin-top: 20px;
+}
+
+.create-station-final-btn:hover:not(:disabled) {
+  transform: translateY(-3px);
+  box-shadow: 0 15px 30px rgba(74, 144, 226, 0.4);
+}
+
+.create-station-final-btn:disabled {
+  background: rgba(255, 255, 255, 0.1);
+  color: #666;
+  cursor: not-allowed;
+  box-shadow: none;
+  transform: none;
+}
+
+/* Add Song Modal Styles */
+.add-song-modal-backdrop {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.8);
+  backdrop-filter: blur(8px);
   display: flex;
   align-items: center;
   justify-content: center;
@@ -596,312 +800,371 @@ body {
   padding: 20px;
 }
 
-.modal-content {
-  background: white;
+.add-song-modal-content {
+  background: linear-gradient(135deg, #2a2a2a 0%, #1a1a1a 50%, #0a0a0a 100%);
   border-radius: 20px;
   width: 100%;
-  max-width: 500px;
+  max-width: 600px;
   max-height: 80vh;
-  overflow-y: auto;
-  box-shadow: 0 20px 40px rgba(0, 0, 0, 0.2);
+  border: 1px solid rgba(255, 255, 255, 0.1);
+  box-shadow: 0 20px 40px rgba(0, 0, 0, 0.5);
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
 }
 
-.modal-header {
+.add-song-modal-header {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding: 25px 30px 20px;
-  border-bottom: 1px solid #eee;
+  padding: 25px 30px;
+  border-bottom: 2px solid rgba(74, 144, 226, 0.3);
+  background: rgba(255, 255, 255, 0.02);
 }
 
-.modal-header h2 {
-  font-size: 1.4rem;
-  font-weight: 600;
-  color: #333;
+.add-song-modal-header h2 {
+  font-size: 24px;
+  color: #4A90E2;
+  font-weight: bold;
   margin: 0;
 }
 
-.close-btn {
-  background: none;
+.add-song-close-btn {
+  width: 40px;
+  height: 40px;
   border: none;
-  cursor: pointer;
-  padding: 5px;
   border-radius: 50%;
-  color: #666;
+  background: rgba(255, 255, 255, 0.1);
+  color: #fff;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
   transition: all 0.3s ease;
 }
 
-.close-btn:hover {
-  background: #f5f5f5;
-  color: #333;
+.add-song-close-btn:hover {
+  background: rgba(255, 255, 255, 0.2);
+  transform: scale(1.1);
 }
 
-.modal-body {
+.add-song-modal-body {
   padding: 30px;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
 }
 
-.modal-body p {
+.add-song-search-container {
+  margin-bottom: 25px;
+}
+
+.add-song-search-box {
+  position: relative;
+  display: flex;
+  align-items: center;
+}
+
+.add-song-search-box .search-icon {
+  position: absolute;
+  left: 15px;
+  color: #4A90E2;
+  z-index: 1;
+}
+
+.add-song-search-box input {
+  width: 100%;
+  padding: 15px 20px 15px 50px;
+  background: rgba(255, 255, 255, 0.05);
+  border: 2px solid rgba(255, 255, 255, 0.1);
+  border-radius: 12px;
+  color: #fff;
+  font-size: 16px;
+  transition: all 0.3s ease;
+}
+
+.add-song-search-box input:focus {
+  outline: none;
+  border-color: #4A90E2;
+  background: rgba(255, 255, 255, 0.1);
+  box-shadow: 0 0 0 3px rgba(74, 144, 226, 0.1);
+}
+
+.add-song-search-box input::placeholder {
+  color: #aaa;
+}
+
+.search-loading {
+  position: absolute;
+  right: 15px;
+  display: flex;
+  align-items: center;
+}
+
+.loading-spinner {
+  width: 20px;
+  height: 20px;
+  border: 2px solid rgba(74, 144, 226, 0.3);
+  border-top: 2px solid #4A90E2;
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+}
+
+.add-song-results-container {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  min-height: 300px;
+  overflow: hidden;
+}
+
+.add-song-placeholder {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  flex: 1;
   text-align: center;
-  color: #666;
-  font-size: 1rem;
+  color: #aaa;
+  gap: 15px;
+}
+
+.add-song-placeholder svg {
+  color: #4A90E2;
+  opacity: 0.6;
+}
+
+.add-song-placeholder p {
   margin: 0;
+  font-size: 16px;
 }
 
-/* Empty State Styles */
-.empty-songs-state {
-  text-align: center;
-  padding: 40px 20px;
-  color: #666;
+.placeholder-subtitle {
+  font-size: 14px !important;
+  color: #666 !important;
 }
 
-.empty-songs-state p {
-  font-size: 1.1rem;
+.add-song-results-list {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  flex: 1;
+  overflow-y: auto;
+  padding-right: 10px;
+}
+
+.add-song-results-list::-webkit-scrollbar {
+  width: 6px;
+}
+
+.add-song-results-list::-webkit-scrollbar-track {
+  background: rgba(255, 255, 255, 0.1);
+  border-radius: 10px;
+}
+
+.add-song-results-list::-webkit-scrollbar-thumb {
+  background: #4A90E2;
+  border-radius: 10px;
+}
+
+.add-song-result-item {
+  display: flex;
+  align-items: center;
+  padding: 15px;
+  background: rgba(255, 255, 255, 0.03);
+  border-radius: 12px;
+  border: 1px solid rgba(255, 255, 255, 0.1);
+  transition: all 0.3s ease;
+  gap: 15px;
+}
+
+.add-song-result-item:hover {
+  background: rgba(255, 255, 255, 0.08);
+  transform: translateY(-1px);
+  box-shadow: 0 5px 15px rgba(0, 0, 0, 0.2);
+}
+
+.result-song-cover {
+  width: 50px;
+  height: 50px;
+  border-radius: 8px;
+  object-fit: cover;
+  flex-shrink: 0;
+}
+
+.result-song-info {
+  flex: 1;
+  min-width: 0;
+}
+
+.result-song-info h4 {
+  font-size: 16px;
+  margin: 0 0 5px 0;
+  color: white;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.result-artist {
+  font-size: 14px;
+  color: #4A90E2;
+  margin: 0 0 3px 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.result-album {
+  font-size: 12px;
+  color: #aaa;
   margin: 0;
-  font-style: italic;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
-/* Mobile Responsive Design */
+.add-song-btn {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 10px 16px;
+  background: linear-gradient(135deg, #4A90E2, #6BB6FF);
+  color: white;
+  border: none;
+  border-radius: 8px;
+  font-size: 14px;
+  font-weight: 600;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  flex-shrink: 0;
+}
+
+.add-song-btn:hover {
+  transform: scale(1.05);
+  box-shadow: 0 5px 15px rgba(74, 144, 226, 0.4);
+}
+
+/* Responsive Design */
 @media (max-width: 768px) {
-  .content {
+  .desktop-main {
+    flex-direction: column;
+    padding: 20px 20px 0 20px;
+    gap: 30px;
+    height: auto;
+  }
+  
+  .left-section {
+    flex: none;
+    max-width: none;
+  }
+  
+  .recommendations-container {
+    height: auto;
+    min-height: 400px;
+  }
+  
+  .vinyl-record-desktop {
+    width: 200px;
+    height: 200px;
+  }
+  
+  .progress-container {
+    padding: 15px 20px;
+  }
+  
+  .home-main {
+    flex-direction: column;
+    padding: 20px;
+    gap: 40px;
+    height: auto;
+    min-height: 100vh;
+  }
+  
+  .home-vinyl-record {
+    width: 180px;
+    height: 180px;
+  }
+  
+  .home-content {
     padding: 30px 20px;
-    margin: 10px;
-    border-radius: 20px;
   }
   
-  .title {
-    font-size: 2rem;
+  .home-title {
+    font-size: 36px;
   }
   
-  .subtitle {
-    font-size: 1rem;
-    margin-bottom: 30px;
+  .home-subtitle {
+    font-size: 16px;
   }
   
-  .create-station-header {
-    padding-top: 20px;
-    margin-bottom: 30px;
+  .home-action-button {
+    padding: 15px 25px;
+    font-size: 14px;
   }
   
-  .create-station-header h1 {
-    font-size: 1.8rem;
+  .create-station-main {
+    flex-direction: column;
+    padding: 20px;
+    gap: 40px;
+    height: auto;
+    min-height: 100vh;
+  }
+  
+  .create-station-vinyl-record {
+    width: 200px;
+    height: 200px;
   }
   
   .create-station-content {
     padding: 30px 20px;
-    border-radius: 20px;
-    margin: 10px;
+  }
+  
+  .create-station-header h1 {
+    font-size: 28px;
   }
   
   .join-method-section h2 {
-    font-size: 1.2rem;
-  }
-  
-  .radio-option label {
-    padding: 14px 16px;
-    font-size: 1rem;
-  }
-  
-  .password-input-section input {
-    padding: 14px 16px;
+    font-size: 16px;
   }
   
   .create-station-final-btn {
-    padding: 16px 24px;
-    font-size: 1rem;
+    padding: 15px 25px;
+    font-size: 14px;
   }
   
-  .join-station-header {
-    padding-top: 20px;
-    margin-bottom: 30px;
-  }
-  
-  .join-station-header h1 {
-    font-size: 1.8rem;
-  }
-  
-  .join-station-content {
-    padding: 30px 20px;
-    border-radius: 20px;
-    margin: 10px;
-  }
-  
-  .verify-method-section h2 {
-    font-size: 1.2rem;
-  }
-  
-  .join-station-final-btn {
-    padding: 16px 24px;
-    font-size: 1rem;
-  }
-  
-  .station-content {
-    padding: 15px;
-  }
-  
-  .station-header {
-    padding-top: 20px;
-    margin-bottom: 30px;
-  }
-  
-  .station-header h1 {
-    font-size: 2rem;
-  }
-  
-  .station-subtitle {
-    font-size: 1rem;
-  }
-  
-  .media-controls-section {
-    padding: 25px 20px;
-  }
-  
-  .songs-section {
-    padding: 25px 20px;
-  }
-  
-  .section-header {
-    flex-direction: column;
-    align-items: stretch;
-    gap: 15px;
-  }
-  
-  .add-song-btn {
-    align-self: center;
-    min-width: 120px;
-  }
-  
-  .song-item {
-    padding: 12px 15px;
-  }
-  
-  .songs-list {
-    max-height: 300px;
-  }
-  
-  .modal-header {
-    padding: 20px 25px 15px;
-  }
-  
-  .modal-body {
-    padding: 25px;
+  .add-song-modal-content {
+    max-width: 100%;
+    max-height: 90vh;
   }
 }
 
 @media (max-width: 480px) {
-  .home-container {
-    padding: 15px;
+  .home-title {
+    font-size: 28px;
   }
   
-  .content {
-    padding: 25px 15px;
+  .home-subtitle {
+    font-size: 14px;
   }
   
-  .title {
-    font-size: 1.8rem;
-  }
-  
-  .create-station {
-    padding: 15px;
-  }
-  
-  .create-station-content {
-    padding: 25px 15px;
-  }
-  
-  .join-station {
-    padding: 15px;
-  }
-  
-  .join-station-content {
-    padding: 25px 15px;
-  }
-  
-  .station-content {
-    padding: 10px;
-  }
-  
-  .station-header h1 {
-    font-size: 1.8rem;
-  }
-  
-  .media-controls-section {
-    padding: 20px 15px;
-  }
-  
-  .songs-section {
-    padding: 20px 15px;
-  }
-  
-  .control-btn {
-    width: 45px;
-    height: 45px;
-  }
-  
-  .control-btn.play-pause {
-    width: 55px;
-    height: 55px;
-  }
-  
-  .modal-backdrop {
-    padding: 15px;
-  }
-  
-  .modal-header {
-    padding: 15px 20px 10px;
-  }
-  
-  .modal-body {
-    padding: 20px;
-  }
-}
-
-/* Larger screens */
-@media (min-width: 1024px) {
-  .title {
-    font-size: 3rem;
-  }
-  
-  .subtitle {
-    font-size: 1.2rem;
+  .home-vinyl-record {
+    width: 150px;
+    height: 150px;
   }
   
   .create-station-header h1 {
-    font-size: 2.5rem;
+    font-size: 24px;
   }
   
-  .button-container {
-    flex-direction: row;
-    justify-content: center;
-    gap: 20px;
+  .create-station-vinyl-record {
+    width: 150px;
+    height: 150px;
   }
   
-  .action-button {
-    min-width: 200px;
+  .password-input-section input {
+    padding:12px 15px;
+    font-size: 14px;
   }
-  
-  .join-station-header h1 {
-    font-size: 2.5rem;
-  }
-  
-  .station-header h1 {
-    font-size: 3rem;
-  }
-  
-  .station-subtitle {
-    font-size: 1.2rem;
-  }
-  
-  .media-controls {
-    gap: 30px;
-  }
-  
-  .control-btn {
-    width: 55px;
-    height: 55px;
-  }
-  
-  .control-btn.play-pause {
-    width: 70px;
-    height: 70px;
-  }
-}
+}
\ No newline at end of file
diff --git a/frontend/src/screens/AddSongModal.jsx b/frontend/src/screens/AddSongModal.jsx
index b4d50bc..a6b024f 100644
--- a/frontend/src/screens/AddSongModal.jsx
+++ b/frontend/src/screens/AddSongModal.jsx
@@ -1,26 +1,146 @@
-import React from 'react';
+import React, { useState } from 'react';
+import { searchSpotifyTracks, isLoggedIn } from '../utils/spotifyAuth.js';
 
 function AddSongModal({ onClose }) {
+  const [searchQuery, setSearchQuery] = useState('');
+  const [searchResults, setSearchResults] = useState([]);
+  const [isLoading, setIsLoading] = useState(false);
+  const [error, setError] = useState('');
+
   const handleBackdropClick = (e) => {
     if (e.target === e.currentTarget) {
       onClose();
     }
   };
 
+  const handleSearch = async (e) => {
+    const query = e.target.value;
+    setSearchQuery(query);
+    setError('');
+    
+    if (query.length > 2) {
+      if (!isLoggedIn()) {
+        setError('Please login to Spotify to search for songs');
+        return;
+      }
+
+      setIsLoading(true);
+      try {
+        const results = await searchSpotifyTracks(query);
+        setSearchResults(results);
+      } catch (err) {
+        setError(err.message === 'Token expired' ? 'Session expired. Please login again.' : 'Search failed. Please try again.');
+        setSearchResults([]);
+        if (err.message === 'Token expired') {
+          setTimeout(() => window.location.reload(), 2000);
+        }
+      } finally {
+        setIsLoading(false);
+      }
+    } else {
+      setSearchResults([]);
+    }
+  };
+
+  const handleKeyPress = async (e) => {
+    if (e.key === 'Enter' && searchQuery.trim() && searchQuery.length > 2) {
+      if (!isLoggedIn()) {
+        setError('Please login to Spotify to search for songs');
+        return;
+      }
+
+      setIsLoading(true);
+      try {
+        const results = await searchSpotifyTracks(searchQuery);
+        setSearchResults(results);
+        setError('');
+      } catch (err) {
+        setError(err.message === 'Token expired' ? 'Session expired. Please login again.' : 'Search failed. Please try again.');
+        setSearchResults([]);
+      } finally {
+        setIsLoading(false);
+      }
+    }
+  };
+
   return (
-    <div className="modal-backdrop" onClick={handleBackdropClick}>
-      <div className="modal-content">
-        <div className="modal-header">
-          <h2>Add Song</h2>
-          <button className="close-btn" onClick={onClose}>
+    <div className="add-song-modal-backdrop" onClick={handleBackdropClick}>
+      <div className="add-song-modal-content">
+        <div className="add-song-modal-header">
+          <h2>Add Song to Station</h2>
+          <button className="add-song-close-btn" onClick={onClose}>
             <svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor">
               <path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"/>
             </svg>
           </button>
         </div>
         
-        <div className="modal-body">
-          <p>Song addition functionality coming soon...</p>
+        <div className="add-song-modal-body">
+          <div className="add-song-search-container">
+            <div className="add-song-search-box">
+              <svg className="search-icon" width="20" height="20" viewBox="0 0 24 24" fill="currentColor">
+                <path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/>
+              </svg>
+              <input
+                type="text"
+                placeholder="Search for songs, artists, or albums..."
+                value={searchQuery}
+                onChange={handleSearch}
+                onKeyPress={handleKeyPress}
+                autoFocus
+              />
+              {isLoading && (
+                <div className="search-loading">
+                  <div className="loading-spinner"></div>
+                </div>
+              )}
+            </div>
+          </div>
+
+          <div className="add-song-results-container">
+            {error && (
+              <div className="add-song-error">
+                <p>{error}</p>
+              </div>
+            )}
+            {searchQuery.length === 0 ? (
+              <div className="add-song-placeholder">
+                <svg width="48" height="48" viewBox="0 0 24 24" fill="currentColor">
+                  <path d="M12 3v10.55c-.59-.34-1.27-.55-2-.55-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4V7h4V3h-6z"/>
+                </svg>
+                <p>Search for music to add to your station</p>
+                <p className="placeholder-subtitle">Enter song title, artist, or album name</p>
+              </div>
+            ) : searchQuery.length <= 2 ? (
+              <div className="add-song-placeholder">
+                <p>Type at least 3 characters to search</p>
+              </div>
+            ) : searchResults.length === 0 && !isLoading && !error ? (
+              <div className="add-song-placeholder">
+                <p>No results found for "{searchQuery}"</p>
+                <p className="placeholder-subtitle">Try different keywords</p>
+              </div>
+            ) : (
+              <div className="add-song-results-list">
+                {searchResults.map(song => (
+                  <div key={song.id} className="add-song-result-item">
+                    <img src={song.coverUrl} alt={`${song.title} cover`} className="result-song-cover" />
+                    <div className="result-song-info">
+                      <h4>{song.title}</h4>
+                      <p className="result-artist">{song.artist}</p>
+                      <p className="result-album">{song.album}</p>
+                    </div>
+                    <button className="add-song-btn" onClick={() => console.log('Adding song:', song)}>
+                      <svg width="20" height="20" viewBox="0 0 24 24" fill="currentColor">
+                        <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+                      </svg>
+                      Add
+                    </button>
+                  </div>
+                ))}
+              </div>
+            )}
+          </div>
         </div>
       </div>
     </div>
diff --git a/frontend/src/screens/CreateStation.jsx b/frontend/src/screens/CreateStation.jsx
index 16c8688..8fb2603 100644
--- a/frontend/src/screens/CreateStation.jsx
+++ b/frontend/src/screens/CreateStation.jsx
@@ -9,50 +9,78 @@ function CreateStation() {
   };
 
   return (
-    <div className="create-station">
-      <header className="create-station-header">
-        <h1>Create a Station on Serena</h1>
-      </header>
-
-      <main className="create-station-content">
-        <div className="join-method-section">
-          <h2>How should people be able to join your station?</h2>
-          
-          <div className="radio-option">
-            <label>
-              <input
-                type="radio"
-                name="joinMethod"
-                value="password"
-                checked={joinMethod === 'password'}
-                onChange={(e) => setJoinMethod(e.target.value)}
-              />
-              Password
-            </label>
-          </div>
-
-          {joinMethod === 'password' && (
-            <div className="password-input-section">
-              <label htmlFor="station-password">Station Password:</label>
-              <input
-                type="password"
-                id="station-password"
-                value={password}
-                onChange={(e) => setPassword(e.target.value)}
-                placeholder="Enter station password"
-              />
+    <div className="create-station-container">
+      <div className="create-station-main">
+        {/* Left Section - Vinyl Animation */}
+        <div className="create-station-left-section">
+          <div className="create-station-vinyl-container">
+            <div className="create-station-vinyl-record">
+              <div className="vinyl-center"></div>
+              <div className="vinyl-grooves"></div>
             </div>
-          )}
+            
+            {/* Animated Music Notes */}
+            <div className="create-station-music-notes">
+              <div className="music-note note-1">♪</div>
+              <div className="music-note note-2">♫</div>
+              <div className="music-note note-3">♪</div>
+            </div>
+          </div>
         </div>
 
-        <button 
-          className="create-station-final-btn"
-          onClick={handleCreateStation}
-          disabled={joinMethod !== 'password' || !password.trim()}
-        >
-          Create Radio Station
-        </button>
-      </main>
+        {/* Right Section - Create Station Form */}
+        <div className="create-station-right-section">
+          <div className="create-station-content">
+            <header className="create-station-header">
+              <h1>Create a Station on Serena</h1>
+            </header>
+
+            <main className="create-station-form">
+              <div className="join-method-section">
+                <h2>How should people be able to join your station?</h2>
+                
+                <div className="radio-option">
+                  <label>
+                    <input
+                      type="radio"
+                      name="joinMethod"
+                      value="password"
+                      checked={joinMethod === 'password'}
+                      onChange={(e) => setJoinMethod(e.target.value)}
+                    />
+                    <span className="radio-custom"></span>
+                    Password
+                  </label>
+                </div>
+
+                {joinMethod === 'password' && (
+                  <div className="password-input-section">
+                    <label htmlFor="station-password">Station Password:</label>
+                    <input
+                      type="password"
+                      id="station-password"
+                      value={password}
+                      onChange={(e) => setPassword(e.target.value)}
+                      placeholder="Enter station password"
+                    />
+                  </div>
+                )}
+              </div>
+
+              <button 
+                className="create-station-final-btn"
+                onClick={handleCreateStation}
+                disabled={joinMethod !== 'password' || !password.trim()}
+              >
+                <svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor">
+                  <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+                </svg>
+                Create Radio Station
+              </button>
+            </main>
+          </div>
+        </div>
+      </div>
     </div>
   );
 }
diff --git a/frontend/src/screens/Home.jsx b/frontend/src/screens/Home.jsx
index 414e9d9..5863cac 100644
--- a/frontend/src/screens/Home.jsx
+++ b/frontend/src/screens/Home.jsx
@@ -14,24 +14,52 @@ function Home() {
 
   return (
     <div className="home-container">
-      <div className="content">
-        <h1 className="title">Radio Station Hub</h1>
-        <p className="subtitle">Create or join a radio station to share music with friends</p>
-        
-        <div className="button-container">
-          <button 
-            className="action-button primary" 
-            onClick={handleCreateStation}
-          >
-            Create Radio Station
-          </button>
-          
-          <button 
-            className="action-button secondary" 
-            onClick={handleJoinStation}
-          >
-            Join Radio Station
-          </button>
+      <div className="home-main">
+        {/* Left Section - Logo/Animation */}
+        <div className="home-left-section">
+          <div className="home-vinyl-container">
+            <div className="home-vinyl-record">
+              <div className="vinyl-center"></div>
+              <div className="vinyl-grooves"></div>
+            </div>
+            
+            {/* Animated Music Notes */}
+            <div className="home-music-notes">
+              <div className="music-note note-1">♪</div>
+              <div className="music-note note-2">♫</div>
+              <div className="music-note note-3">♪</div>
+            </div>
+          </div>
+        </div>
+
+        {/* Right Section - Content */}
+        <div className="home-right-section">
+          <div className="home-content">
+            <h1 className="home-title">Serena Hub</h1>
+            <p className="home-subtitle">Create or join a radio station to share music with friends</p>
+            
+            <div className="home-button-container">
+              <button 
+                className="home-action-button primary" 
+                onClick={handleCreateStation}
+              >
+                <svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor">
+                  <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+                </svg>
+                Create Radio Station
+              </button>
+              
+              <button 
+                className="home-action-button secondary" 
+                onClick={handleJoinStation}
+              >
+                <svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor">
+                  <path d="M15 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm-9-2V7H4v3H1v2h3v3h2v-3h3v-2H6zm9 4c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"/>
+                </svg>
+                Join Radio Station
+              </button>
+            </div>
+          </div>
         </div>
       </div>
     </div>
diff --git a/frontend/src/screens/JoinStation.jsx b/frontend/src/screens/JoinStation.jsx
index 3bb3302..0dcd834 100644
--- a/frontend/src/screens/JoinStation.jsx
+++ b/frontend/src/screens/JoinStation.jsx
@@ -13,50 +13,78 @@ function JoinStation() {
   };
 
   return (
-    <div className="join-station">
-      <header className="join-station-header">
-        <h1>Join a Station on Serena</h1>
-      </header>
-
-      <main className="join-station-content">
-        <div className="verify-method-section">
-          <h2>How would you like to verify access?</h2>
-          
-          <div className="radio-option">
-            <label>
-              <input
-                type="radio"
-                name="verifyMethod"
-                value="password"
-                checked={verifyMethod === 'password'}
-                onChange={(e) => setVerifyMethod(e.target.value)}
-              />
-              Password
-            </label>
-          </div>
-
-          {verifyMethod === 'password' && (
-            <div className="password-input-section">
-              <label htmlFor="station-password">Station Password:</label>
-              <input
-                type="password"
-                id="station-password"
-                value={password}
-                onChange={(e) => setPassword(e.target.value)}
-                placeholder="Enter station password"
-              />
+    <div className="join-station-container">
+      <div className="join-station-main">
+        {/* Left Section - Vinyl Animation */}
+        <div className="join-station-left-section">
+          <div className="join-station-vinyl-container">
+            <div className="join-station-vinyl-record">
+              <div className="vinyl-center"></div>
+              <div className="vinyl-grooves"></div>
             </div>
-          )}
+            
+            {/* Animated Music Notes */}
+            <div className="join-station-music-notes">
+              <div className="music-note note-1">♪</div>
+              <div className="music-note note-2">♫</div>
+              <div className="music-note note-3">♪</div>
+            </div>
+          </div>
         </div>
 
-        <button 
-          className="join-station-final-btn"
-          onClick={handleJoinStation}
-          disabled={verifyMethod !== 'password' || !password.trim()}
-        >
-          Join Station
-        </button>
-      </main>
+        {/* Right Section - Join Station Form */}
+        <div className="join-station-right-section">
+          <div className="join-station-content">
+            <header className="join-station-header">
+              <h1>Join a Station on Serena</h1>
+            </header>
+
+            <main className="join-station-form">
+              <div className="verify-method-section">
+                <h2>How would you like to verify access?</h2>
+                
+                <div className="radio-option">
+                  <label>
+                    <input
+                      type="radio"
+                      name="verifyMethod"
+                      value="password"
+                      checked={verifyMethod === 'password'}
+                      onChange={(e) => setVerifyMethod(e.target.value)}
+                    />
+                    <span className="radio-custom"></span>
+                    Password
+                  </label>
+                </div>
+
+                {verifyMethod === 'password' && (
+                  <div className="password-input-section">
+                    <label htmlFor="station-password">Station Password:</label>
+                    <input
+                      type="password"
+                      id="station-password"
+                      value={password}
+                      onChange={(e) => setPassword(e.target.value)}
+                      placeholder="Enter station password"
+                    />
+                  </div>
+                )}
+              </div>
+
+              <button 
+                className="join-station-final-btn"
+                onClick={handleJoinStation}
+                disabled={verifyMethod !== 'password' || !password.trim()}
+              >
+                <svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor">
+                  <path d="M15 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm-9-2V7H4v3H1v2h3v3h2v-3h3v-2H6zm9 4c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"/>
+                </svg>
+                Join Radio Station
+              </button>
+            </main>
+          </div>
+        </div>
+      </div>
     </div>
   );
 }
diff --git a/frontend/src/screens/StationPage.jsx b/frontend/src/screens/StationPage.jsx
index 77d5058..08a4287 100644
--- a/frontend/src/screens/StationPage.jsx
+++ b/frontend/src/screens/StationPage.jsx
@@ -1,30 +1,27 @@
 import React, { useState } from 'react';
 import AddSongModal from './AddSongModal';
-import LoginButton from '../components/LoginButton';
 
 function StationPage() {
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [currentSong, setCurrentSong] = useState({
     title: "No song playing",
     artist: "Add songs to get started",
-    isPlaying: false
+    isPlaying: false,
+    progress: 0,
+    duration: 180 // 3 minutes in seconds
+  });
+
+  const [nextSong] = useState({
+    title: "No song queued",
+    artist: "No Artist Queued"
   });
 
-  // Empty song list - no songs initially
   const recommendedSongs = [];
 
   const handlePlayPause = () => {
     setCurrentSong(prev => ({ ...prev, isPlaying: !prev.isPlaying }));
   };
 
-  const handleNext = () => {
-    console.log('Next song');
-  };
-
-  const handlePrevious = () => {
-    console.log('Previous song');
-  };
-
   const openModal = () => {
     setIsModalOpen(true);
   };
@@ -34,34 +31,38 @@ function StationPage() {
   };
 
   return (
-    <div className="station-page">
-      <div className="animated-background">
-        {[...Array(20)].map((_, i) => (
-          <div key={i} className={`star star-${i + 1}`}></div>
-        ))}
-      </div>
-
-      <div className="station-content">
-        <header className="station-header">
-          <h1>Serena Station</h1>
-          <p className="station-subtitle">Collaborative Music Experience</p>
-          <LoginButton />
-        </header>
-
-        <div className="media-controls-section">
-          <div className="current-song">
-            <h3>{currentSong.title}</h3>
-            <p>{currentSong.artist}</p>
-          </div>
-          
-          <div className="media-controls">
-            <button className="control-btn" onClick={handlePrevious}>
-              <svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor">
-                <path d="M6 18l8.5-6L6 6v12zM16 6v12h2V6h-2z"/>
-              </svg>
-            </button>
+    <div className="station-page-desktop">      
+      {/* Main Layout */}
+      <div className="desktop-main">
+        {/* Left Section */}
+        <div className="left-section">
+          {/* Vinyl Record */}
+          <div className="vinyl-container">
+            <div className={`vinyl-record-desktop ${currentSong.isPlaying ? 'spinning' : ''}`}>
+              <div className="vinyl-center"></div>
+              <div className="vinyl-grooves"></div>
+            </div>
             
-            <button className="control-btn play-pause" onClick={handlePlayPause}>
+            {/* Animated Music Notes */}
+            {currentSong.isPlaying && (
+              <div className="music-notes-desktop">
+                <div className="music-note note-1">♪</div>
+                <div className="music-note note-2">♫</div>
+                <div className="music-note note-3">♪</div>
+              </div>
+            )}
+          </div>
+
+          {/* Next Song Info */}
+          <div className="next-song-info">
+            <p className="next-label">Next song:</p>
+            <h4>{nextSong.title}</h4>
+            <p className="next-artist">{nextSong.artist}</p>
+          </div>
+
+          {/* Bottom Play Icon */}
+          <div className="bottom-play-icon">
+            <button className="mini-play-btn" onClick={handlePlayPause}>
               {currentSong.isPlaying ? (
                 <svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor">
                   <path d="M6 19h4V5H6v14zm8-14v14h4V5h-4z"/>
@@ -72,43 +73,55 @@ function StationPage() {
                 </svg>
               )}
             </button>
-            
-            <button className="control-btn" onClick={handleNext}>
-              <svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor">
-                <path d="M6 18l8.5-6L6 6v12zM16 6v12h2V6h-2z"/>
-              </svg>
-            </button>
           </div>
         </div>
 
-        <div className="songs-section">
-          <div className="section-header">
-            <h2>Song Queue</h2>
-            <button className="add-song-btn" onClick={openModal}>
-              Add Song
-            </button>
-          </div>
-          
-          <div className="songs-list">
-            {recommendedSongs.length === 0 ? (
-              <div className="empty-songs-state">
-                <p>No songs in queue yet. Add some songs to get started!</p>
-              </div>
-            ) : (
-              recommendedSongs.map(song => (
-                <div key={song.id} className="song-item">
-                  <div className="song-info">
-                    <h4>{song.title}</h4>
-                    <p>{song.artist}</p>
-                  </div>
-                  <span className="song-duration">{song.duration}</span>
+        {/* Right Section - Recommendations */}
+        <div className="right-section">
+          <div className="recommendations-container">
+            <div className="recommendations-header">
+              <h2>Song Suggestions</h2>
+              <button className="add-suggestion-btn" onClick={openModal}>
+                <svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor">
+                  <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+                </svg>
+              </button>
+            </div>
+            
+            <div className="recommendations-list">
+              {recommendedSongs.length === 0 ? (
+                <div style={{ textAlign: 'center', padding: '40px', color: '#aaa' }}>
+                  <p>No songs suggested yet</p>
+                  <p style={{ fontSize: '14px', marginTop: '10px' }}>Add songs to get started!</p>
                 </div>
-              ))
-            )}
+              ) : (
+                recommendedSongs.map(song => (
+                  <div key={song.id} className="recommendation-item">
+                    <img src={song.coverUrl} alt={`${song.title} cover`} className="song-cover" />
+                    <div className="song-info">
+                      <h4>{song.title}</h4>
+                      <p className="artist">{song.artist}</p>
+                      <p className="album">{song.album}</p>
+                    </div>
+                    <span className="duration">{song.duration}</span>
+                  </div>
+                ))
+              )}
+            </div>
           </div>
         </div>
       </div>
 
+      {/* Progress Bar */}
+      <div className="progress-container">
+        <div className="progress-bar">
+          <div 
+            className="progress-fill" 
+            style={{ width: `${(currentSong.progress / currentSong.duration) * 100}%` }}
+          ></div>
+        </div>
+      </div>
+
       {isModalOpen && <AddSongModal onClose={closeModal} />}
     </div>
   );
diff --git a/frontend/src/utils/spotifyAuth.js b/frontend/src/utils/spotifyAuth.js
index 67fc94a..342897c 100644
--- a/frontend/src/utils/spotifyAuth.js
+++ b/frontend/src/utils/spotifyAuth.js
@@ -38,3 +38,39 @@ export const removeAccessToken = () => {
 export const isLoggedIn = () => {
   return !!getAccessToken();
 };
+
+export const searchSpotifyTracks = async (query) => {
+  const token = getAccessToken();
+  if (!token) {
+    throw new Error('No access token available');
+  }
+
+  const response = await fetch(
+    `https://api.spotify.com/v1/search?q=${encodeURIComponent(query)}&type=track&limit=20`,
+    {
+      headers: {
+        Authorization: `Bearer ${token}`,
+      },
+    }
+  );
+
+  if (!response.ok) {
+    if (response.status === 401) {
+      removeAccessToken();
+      throw new Error('Token expired');
+    }
+    throw new Error('Search failed');
+  }
+
+  const data = await response.json();
+  return data.tracks.items.map((track) => ({
+    id: track.id,
+    title: track.name,
+    artist: track.artists.map((artist) => artist.name).join(', '),
+    album: track.album.name,
+    coverUrl: track.album.images[0]?.url || '',
+    duration: track.duration_ms,
+    previewUrl: track.preview_url,
+    spotifyUrl: track.external_urls.spotify,
+  }));
+};

From 7e9b155fa1a7cc1cf4786b16a3c1d01910447d14 Mon Sep 17 00:00:00 2001
From: Tobias <stbuctob@bx.fallmerayer.it>
Date: Sat, 2 Aug 2025 02:07:47 +0200
Subject: [PATCH 2/4] fix

---
 frontend/src/screens/CreateStation.jsx | 3 +++
 frontend/src/screens/JoinStation.jsx   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/frontend/src/screens/CreateStation.jsx b/frontend/src/screens/CreateStation.jsx
index 5a75fa4..c7c56f6 100644
--- a/frontend/src/screens/CreateStation.jsx
+++ b/frontend/src/screens/CreateStation.jsx
@@ -51,6 +51,9 @@ function CreateStation() {
         </button>
       </main>
     </div>
+    </div>
+    </div>
+    </div>
   );
 }
 
diff --git a/frontend/src/screens/JoinStation.jsx b/frontend/src/screens/JoinStation.jsx
index 3444137..2961198 100644
--- a/frontend/src/screens/JoinStation.jsx
+++ b/frontend/src/screens/JoinStation.jsx
@@ -53,6 +53,9 @@ function JoinStation() {
           );
         })}
       </main>
+      </div>
+      </div>
+      </div>
     </div>
   );
 }

From 27755af2e02cb28530c67c77203bd4b71396500b Mon Sep 17 00:00:00 2001
From: Tobias <stbuctob@bx.fallmerayer.it>
Date: Sat, 2 Aug 2025 09:40:34 +0200
Subject: [PATCH 3/4] design update

---
 backend/gradlew                        |   12 +-
 backend/gradlew.bat                    |    6 +-
 frontend/src/index.css                 | 1180 ++++++++++++++++++------
 frontend/src/screens/CreateStation.jsx |  161 +++-
 frontend/src/screens/Home.jsx          |   24 +-
 frontend/src/screens/JoinStation.jsx   |   82 +-
 frontend/src/screens/StationPage.jsx   |  109 ++-
 7 files changed, 1216 insertions(+), 358 deletions(-)

diff --git a/backend/gradlew b/backend/gradlew
index 23d15a9..1aa94a4 100755
--- a/backend/gradlew
+++ b/backend/gradlew
@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 
 ##############################################################################
 #
@@ -57,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -86,7 +84,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -114,7 +112,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -205,7 +203,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
@@ -213,7 +211,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/backend/gradlew.bat b/backend/gradlew.bat
index db3a6ac..25da30d 100644
--- a/backend/gradlew.bat
+++ b/backend/gradlew.bat
@@ -13,8 +13,6 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -70,11 +68,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/frontend/src/index.css b/frontend/src/index.css
index fa303ed..8b51e2a 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -377,161 +377,147 @@ body {
   box-shadow: 0 0 10px rgba(74, 144, 226, 0.5);
 }
 
-/* Home Page Styles */
+/* Home Page Styles - Improved */
 .home-container {
   min-height: 100vh;
-  position: relative;
-  display: flex;
-  flex-direction: column;
-  background: #1a1a1a;
-}
-
-.home-main {
-  display: flex;
-  flex: 1;
-  padding: 40px;
-  gap: 60px;
-  max-width: 1400px;
-  margin: 0 auto;
-  width: 100%;
-  height: 100vh;
-  align-items: center;
-}
-
-/* Home Left Section */
-.home-left-section {
-  flex: 1;
   display: flex;
   align-items: center;
   justify-content: center;
-}
-
-.home-vinyl-container {
+  background: linear-gradient(135deg, #0a0a0a 0%, #1a1a1a 50%, #2a2a2a 100%);
+  padding: 20px;
   position: relative;
 }
 
-.home-vinyl-record {
-  width: 250px;
-  height: 250px;
-  background: radial-gradient(circle, #1a1a1a 30%, #333 31%, #1a1a1a 32%, #333 33%, #1a1a1a 34%);
-  border-radius: 50%;
-  position: relative;
-  box-shadow: 0 20px 40px rgba(0, 0, 0, 0.5);
-  animation: spin 8s linear infinite;
-}
-
-.home-music-notes {
+.home-container::before {
+  content: '';
   position: absolute;
   top: 0;
   left: 0;
-  width: 100%;
-  height: 100%;
+  right: 0;
+  bottom: 0;
+  background: radial-gradient(circle at 30% 20%, rgba(74, 144, 226, 0.1) 0%, transparent 50%),
+              radial-gradient(circle at 70% 80%, rgba(74, 144, 226, 0.05) 0%, transparent 50%);
   pointer-events: none;
 }
 
-.home-music-notes .music-note {
-  position: absolute;
-  font-size: 20px;
-  color: #4A90E2;
-  animation: float 4s ease-in-out infinite;
-}
-
-.home-music-notes .note-1 {
-  top: 20%;
-  right: -30px;
-  animation-delay: 0s;
-}
-
-.home-music-notes .note-2 {
-  top: 50%;
-  right: -50px;
-  animation-delay: 1.5s;
-}
-
-.home-music-notes .note-3 {
-  top: 80%;
-  right: -30px;
-  animation-delay: 3s;
-}
-
-/* Home Right Section */
-.home-right-section {
-  flex: 1;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
 .home-content {
+  background: rgba(255, 255, 255, 0.02);
+  backdrop-filter: blur(20px);
+  border: 1px solid rgba(255, 255, 255, 0.05);
+  border-radius: 24px;
+  padding: 60px 50px;
   text-align: center;
+  position: relative;
+  z-index: 1;
   max-width: 500px;
-  background: linear-gradient(135deg, #2a2a2a 0%, #1a1a1a 50%, #0a0a0a 100%);
-  backdrop-filter: blur(10px);
-  border-radius: 20px;
-  padding: 50px 40px;
-  border: 1px solid rgba(255, 255, 255, 0.1);
+  width: 100%;
+  box-shadow: 0 25px 50px rgba(0, 0, 0, 0.3);
+}
+
+.home-header {
+  margin-bottom: 50px;
 }
 
 .home-title {
-  font-size: 48px;
-  font-weight: bold;
-  color: #4A90E2;
+  font-size: 42px;
+  font-weight: 300;
+  color: #ffffff;
   margin-bottom: 20px;
-  text-shadow: 0 2px 10px rgba(74, 144, 226, 0.3);
+  letter-spacing: -0.5px;
+  line-height: 1.2;
+}
+
+.home-title::after {
+  content: '';
+  display: block;
+  width: 80px;
+  height: 3px;
+  background: linear-gradient(90deg, #4A90E2, #6BB6FF);
+  margin: 20px auto 0;
+  border-radius: 2px;
 }
 
 .home-subtitle {
-  font-size: 18px;
-  color: #ccc;
-  margin-bottom: 40px;
+  font-size: 16px;
+  color: #a0a0a0;
   line-height: 1.6;
+  font-weight: 300;
+  max-width: 350px;
+  margin: 0 auto;
 }
 
-.home-button-container {
+.home-actions {
   display: flex;
   flex-direction: column;
-  gap: 20px;
+  gap: 16px;
 }
 
-.home-action-button {
+.home-btn {
   display: flex;
   align-items: center;
   justify-content: center;
   gap: 12px;
-  padding: 18px 30px;
+  padding: 18px 32px;
   font-size: 16px;
-  font-weight: bold;
+  font-weight: 500;
   border: none;
   border-radius: 12px;
   cursor: pointer;
-  transition: all 0.3s ease;
-  text-transform: uppercase;
-  letter-spacing: 1px;
-  min-height: 60px;
+  transition: all 0.4s cubic-bezier(0.4, 0, 0.2, 1);
+  position: relative;
+  overflow: hidden;
+  letter-spacing: 0.5px;
 }
 
-.home-action-button.primary {
-  background: linear-gradient(135deg, #4A90E2, #6BB6FF);
+.home-btn::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: -100%;
+  width: 100%;
+  height: 100%;
+  background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.1), transparent);
+  transition: left 0.5s;
+}
+
+.home-btn:hover::before {
+  left: 100%;
+}
+
+.btn-icon {
+  font-size: 18px;
+  filter: grayscale(0.3);
+}
+
+.home-btn-primary {
+  background: linear-gradient(135deg, #4A90E2 0%, #6BB6FF 100%);
   color: white;
-  box-shadow: 0 10px 20px rgba(74, 144, 226, 0.3);
+  box-shadow: 0 8px 25px rgba(74, 144, 226, 0.25);
 }
 
-.home-action-button.primary:hover {
-  transform: translateY(-3px);
-  box-shadow: 0 15px 30px rgba(74, 144, 226, 0.4);
+.home-btn-primary:hover {
+  transform: translateY(-2px);
+  box-shadow: 0 15px 35px rgba(74, 144, 226, 0.35);
+  background: linear-gradient(135deg, #5ba0f2 0%, #7bc6ff 100%);
 }
 
-.home-action-button.secondary {
-  background: transparent;
+.home-btn-secondary {
+  background: rgba(255, 255, 255, 0.05);
+  color: #ffffff;
+  border: 1px solid rgba(255, 255, 255, 0.1);
+  box-shadow: 0 4px 15px rgba(0, 0, 0, 0.1);
+}
+
+.home-btn-secondary:hover {
+  transform: translateY(-2px);
+  background: rgba(255, 255, 255, 0.08);
+  border-color: rgba(74, 144, 226, 0.3);
+  box-shadow: 0 8px 25px rgba(0, 0, 0, 0.2);
   color: #4A90E2;
-  border: 2px solid #4A90E2;
-  box-shadow: 0 5px 15px rgba(74, 144, 226, 0.2);
 }
 
-.home-action-button.secondary:hover {
-  background: rgba(74, 144, 226, 0.1);
-  transform: translateY(-3px);
-  box-shadow: 0 10px 25px rgba(74, 144, 226, 0.3);
+.home-btn:active {
+  transform: translateY(0);
 }
 
 /* Create Station Styles */
@@ -540,7 +526,19 @@ body {
   position: relative;
   display: flex;
   flex-direction: column;
-  background: #1a1a1a;
+  background: linear-gradient(135deg, #0a0a0a 0%, #1a1a1a 50%, #2a2a2a 100%);
+}
+
+.create-station-container::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: radial-gradient(circle at 30% 20%, rgba(74, 144, 226, 0.1) 0%, transparent 50%),
+              radial-gradient(circle at 70% 80%, rgba(74, 144, 226, 0.05) 0%, transparent 50%);
+  pointer-events: none;
 }
 
 .create-station-main {
@@ -553,6 +551,8 @@ body {
   width: 100%;
   height: 100vh;
   align-items: center;
+  position: relative;
+  z-index: 1;
 }
 
 /* Create Station Left Section */
@@ -622,8 +622,8 @@ body {
 .create-station-content {
   width: 100%;
   max-width: 500px;
-  background: linear-gradient(135deg, #2a2a2a 0%, #1a1a1a 50%, #0a0a0a 100%);
-  backdrop-filter: blur(10px);
+  background: linear-gradient(135deg, rgba(255, 255, 255, 0.02) 0%, rgba(255, 255, 255, 0.01) 100%);
+  backdrop-filter: blur(20px);
   border-radius: 20px;
   padding: 40px;
   border: 1px solid rgba(255, 255, 255, 0.1);
@@ -643,85 +643,26 @@ body {
   text-shadow: 0 2px 10px rgba(74, 144, 226, 0.3);
 }
 
+.create-station-subtitle {
+  font-size: 16px;
+  color: #a0a0a0;
+  margin: 0;
+  line-height: 1.5;
+}
+
 .create-station-form {
   display: flex;
   flex-direction: column;
-  gap: 30px;
+  gap: 25px;
 }
 
-.join-method-section h2 {
-  font-size: 18px;
-  color: #fff;
-  margin-bottom: 20px;
-  font-weight: 600;
-}
-
-.radio-option {
-  margin-bottom: 20px;
-}
-
-.radio-option label {
-  display: flex;
-  align-items: center;
-  gap: 12px;
-  cursor: pointer;
-  padding: 15px 20px;
-  background: rgba(255, 255, 255, 0.05);
-  border: 2px solid rgba(255, 255, 255, 0.1);
-  border-radius: 12px;
-  transition: all 0.3s ease;
-  font-size: 16px;
-  font-weight: 500;
-  color: #fff;
-}
-
-.radio-option label:hover {
-  background: rgba(255, 255, 255, 0.1);
-  border-color: rgba(74, 144, 226, 0.5);
-}
-
-.radio-option input[type="radio"] {
-  display: none;
-}
-
-.radio-custom {
-  width: 20px;
-  height: 20px;
-  border: 2px solid #4A90E2;
-  border-radius: 50%;
-  position: relative;
-  transition: all 0.3s ease;
-}
-
-.radio-option input[type="radio"]:checked + .radio-custom {
-  background: #4A90E2;
-  box-shadow: 0 0 10px rgba(74, 144, 226, 0.5);
-}
-
-.radio-option input[type="radio"]:checked + .radio-custom::after {
-  content: '';
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  width: 8px;
-  height: 8px;
-  background: white;
-  border-radius: 50%;
-}
-
-.password-input-section {
+.form-group {
   display: flex;
   flex-direction: column;
-  gap: 10px;
-  margin-top: 20px;
-  padding: 20px;
-  background: rgba(255, 255, 255, 0.03);
-  border-radius: 12px;
-  border: 1px solid rgba(255, 255, 255, 0.1);
+  gap: 8px;
 }
 
-.password-input-section label {
+.form-group label {
   font-size: 14px;
   font-weight: 600;
   color: #4A90E2;
@@ -729,27 +670,50 @@ body {
   letter-spacing: 1px;
 }
 
-.password-input-section input {
+.form-group input,
+.form-group textarea {
   padding: 15px 20px;
   background: rgba(255, 255, 255, 0.05);
   border: 2px solid rgba(255, 255, 255, 0.1);
-  border-radius: 10px;
+  border-radius: 12px;
   color: #fff;
   font-size: 16px;
+  font-family: inherit;
   transition: all 0.3s ease;
+  resize: none;
 }
 
-.password-input-section input:focus {
+.form-group input:focus,
+.form-group textarea:focus {
   outline: none;
   border-color: #4A90E2;
   background: rgba(255, 255, 255, 0.1);
   box-shadow: 0 0 0 3px rgba(74, 144, 226, 0.1);
 }
 
-.password-input-section input::placeholder {
+.form-group input::placeholder,
+.form-group textarea::placeholder {
   color: #aaa;
 }
 
+.form-group input:disabled,
+.form-group textarea:disabled {
+  opacity: 0.6;
+  cursor: not-allowed;
+}
+
+.error-message {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  padding: 12px 16px;
+  background: rgba(255, 59, 48, 0.1);
+  border: 1px solid rgba(255, 59, 48, 0.3);
+  border-radius: 8px;
+  color: #ff3b30;
+  font-size: 14px;
+}
+
 .create-station-final-btn {
   display: flex;
   align-items: center;
@@ -768,7 +732,7 @@ body {
   background: linear-gradient(135deg, #4A90E2, #6BB6FF);
   color: white;
   box-shadow: 0 10px 20px rgba(74, 144, 226, 0.3);
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .create-station-final-btn:hover:not(:disabled) {
@@ -784,6 +748,639 @@ body {
   transform: none;
 }
 
+/* Success State */
+.success-state {
+  text-align: center;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 20px;
+}
+
+.success-icon {
+  width: 80px;
+  height: 80px;
+  background: linear-gradient(135deg, #34C759, #30D158);
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: white;
+  margin-bottom: 10px;
+  box-shadow: 0 10px 30px rgba(52, 199, 89, 0.3);
+}
+
+.success-state h2 {
+  font-size: 24px;
+  color: #4A90E2;
+  margin: 0;
+}
+
+.success-state p {
+  color: #a0a0a0;
+  margin: 0;
+  line-height: 1.5;
+}
+
+.join-code-display {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  padding: 15px 20px;
+  background: rgba(74, 144, 226, 0.1);
+  border: 2px solid rgba(74, 144, 226, 0.3);
+  border-radius: 12px;
+  margin: 10px 0;
+}
+
+.join-code {
+  font-family: 'Courier New', monospace;
+  font-size: 18px;
+  font-weight: bold;
+  color: #4A90E2;
+  letter-spacing: 2px;
+}
+
+.copy-btn {
+  padding: 8px;
+  background: rgba(74, 144, 226, 0.2);
+  border: none;
+  border-radius: 6px;
+  color: #4A90E2;
+  cursor: pointer;
+  transition: all 0.3s ease;
+}
+
+.copy-btn:hover {
+  background: rgba(74, 144, 226, 0.3);
+  transform: scale(1.1);
+}
+
+.go-to-station-btn {
+  padding: 15px 30px;
+  background: linear-gradient(135deg, #4A90E2, #6BB6FF);
+  color: white;
+  border: none;
+  border-radius: 12px;
+  font-size: 16px;
+  font-weight: 600;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  margin-top: 10px;
+}
+
+.go-to-station-btn:hover {
+  transform: translateY(-2px);
+  box-shadow: 0 10px 20px rgba(74, 144, 226, 0.3);
+}
+
+/* Join Station Styles */
+.join-station-container {
+  min-height: 100vh;
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  background: linear-gradient(135deg, #0a0a0a 0%, #1a1a1a 50%, #2a2a2a 100%);
+}
+
+.join-station-container::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: radial-gradient(circle at 30% 20%, rgba(74, 144, 226, 0.1) 0%, transparent 50%),
+              radial-gradient(circle at 70% 80%, rgba(74, 144, 226, 0.05) 0%, transparent 50%);
+  pointer-events: none;
+}
+
+.join-station-main {
+  display: flex;
+  flex: 1;
+  padding: 40px;
+  gap: 60px;
+  max-width: 1400px;
+  margin: 0 auto;
+  width: 100%;
+  height: 100vh;
+  align-items: center;
+  position: relative;
+  z-index: 1;
+}
+
+/* Join Station Left Section */
+.join-station-left-section {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.join-station-vinyl-container {
+  position: relative;
+}
+
+.join-station-vinyl-record {
+  width: 280px;
+  height: 280px;
+  background: radial-gradient(circle, #1a1a1a 30%, #333 31%, #1a1a1a 32%, #333 33%, #1a1a1a 34%);
+  border-radius: 50%;
+  position: relative;
+  box-shadow: 0 20px 40px rgba(0, 0, 0, 0.5);
+  animation: spin 6s linear infinite;
+}
+
+.join-station-music-notes {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  pointer-events: none;
+}
+
+.join-station-music-notes .music-note {
+  position: absolute;
+  font-size: 24px;
+  color: #4A90E2;
+  animation: float 3s ease-in-out infinite;
+}
+
+.join-station-music-notes .note-1 {
+  top: 20%;
+  right: -40px;
+  animation-delay: 0s;
+}
+
+.join-station-music-notes .note-2 {
+  top: 50%;
+  right: -60px;
+  animation-delay: 1s;
+}
+
+.join-station-music-notes .note-3 {
+  top: 80%;
+  right: -40px;
+  animation-delay: 2s;
+}
+
+/* Join Station Right Section */
+.join-station-right-section {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.join-station-content {
+  width: 100%;
+  max-width: 600px;
+  background: linear-gradient(135deg, rgba(255, 255, 255, 0.02) 0%, rgba(255, 255, 255, 0.01) 100%);
+  backdrop-filter: blur(20px);
+  border-radius: 20px;
+  padding: 40px;
+  border: 1px solid rgba(255, 255, 255, 0.1);
+  box-shadow: 0 20px 40px rgba(0, 0, 0, 0.3);
+  max-height: 80vh;
+  overflow-y: auto;
+}
+
+.join-station-header {
+  text-align: center;
+  margin-bottom: 40px;
+}
+
+.join-station-header h1 {
+  font-size: 32px;
+  font-weight: bold;
+  color: #4A90E2;
+  margin-bottom: 10px;
+  text-shadow: 0 2px 10px rgba(74, 144, 226, 0.3);
+}
+
+.join-station-subtitle {
+  font-size: 16px;
+  color: #a0a0a0;
+  margin: 0;
+  line-height: 1.5;
+}
+
+.join-station-body {
+  display: flex;
+  flex-direction: column;
+  gap: 25px;
+}
+
+/* Loading State */
+.loading-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 20px;
+  padding: 40px 20px;
+  text-align: center;
+}
+
+.loading-spinner {
+  width: 40px;
+  height: 40px;
+  border: 3px solid rgba(74, 144, 226, 0.2);
+  border-top: 3px solid #4A90E2;
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+}
+
+.loading-state p {
+  color: #a0a0a0;
+  font-size: 16px;
+}
+
+/* Empty State */
+.empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 20px;
+  padding: 40px 20px;
+  text-align: center;
+}
+
+.empty-icon {
+  width: 80px;
+  height: 80px;
+  background: rgba(74, 144, 226, 0.1);
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #4A90E2;
+  margin-bottom: 10px;
+}
+
+.empty-state h3 {
+  font-size: 20px;
+  color: #4A90E2;
+  margin: 0;
+}
+
+.empty-state p {
+  color: #a0a0a0;
+  margin: 0;
+  line-height: 1.5;
+  max-width: 300px;
+}
+
+.create-station-btn {
+  padding: 15px 30px;
+  background: linear-gradient(135deg, #4A90E2, #6BB6FF);
+  color: white;
+  border: none;
+  border-radius: 12px;
+  font-size: 16px;
+  font-weight: 600;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  margin-top: 10px;
+}
+
+.create-station-btn:hover {
+  transform: translateY(-2px);
+  box-shadow: 0 10px 20px rgba(74, 144, 226, 0.3);
+}
+
+/* Stations Grid */
+.stations-grid {
+  display: flex;
+  flex-direction: column;
+  gap: 25px;
+}
+
+.stations-grid h2 {
+  font-size: 24px;
+  color: #4A90E2;
+  margin: 0;
+  text-align: center;
+  padding-bottom: 15px;
+  border-bottom: 2px solid rgba(74, 144, 226, 0.3);
+}
+
+.stations-list {
+  display: flex;
+  flex-direction: column;
+  gap: 15px;
+  max-height: 400px;
+  overflow-y: auto;
+  padding-right: 10px;
+}
+
+.stations-list::-webkit-scrollbar {
+  width: 6px;
+}
+
+.stations-list::-webkit-scrollbar-track {
+  background: rgba(255, 255, 255, 0.1);
+  border-radius: 10px;
+}
+
+.stations-list::-webkit-scrollbar-thumb {
+  background: #4A90E2;
+  border-radius: 10px;
+}
+
+/* Station Card */
+.station-card {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 20px;
+  background: rgba(255, 255, 255, 0.05);
+  border: 1px solid rgba(255, 255, 255, 0.1);
+  border-radius: 15px;
+  transition: all 0.3s ease;
+  cursor: pointer;
+}
+
+.station-card:hover {
+  background: rgba(255, 255, 255, 0.08);
+  transform: translateY(-2px);
+  box-shadow: 0 8px 25px rgba(0, 0, 0, 0.2);
+  border-color: rgba(74, 144, 226, 0.3);
+}
+
+.station-info {
+  flex: 1;
+  margin-right: 20px;
+}
+
+.station-info h3 {
+  font-size: 18px;
+  color: #ffffff;
+  margin: 0 0 8px 0;
+  font-weight: 600;
+}
+
+.station-description {
+  font-size: 14px;
+  color: #a0a0a0;
+  margin: 0 0 10px 0;
+  line-height: 1.4;
+}
+
+.station-meta {
+  display: flex;
+  gap: 15px;
+  margin-top: 8px;
+}
+
+.station-id {
+  font-size: 12px;
+  color: #4A90E2;
+  font-family: 'Courier New', monospace;
+  background: rgba(74, 144, 226, 0.1);
+  padding: 4px 8px;
+  border-radius: 6px;
+}
+
+.join-station-btn {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 12px 20px;
+  background: linear-gradient(135deg, #4A90E2, #6BB6FF);
+  color: white;
+  border: none;
+  border-radius: 10px;
+  font-size: 14px;
+  font-weight: 600;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  white-space: nowrap;
+}
+
+.join-station-btn:hover {
+  transform: translateY(-1px);
+  box-shadow: 0 6px 15px rgba(74, 144, 226, 0.4);
+  background: linear-gradient(135deg, #5ba0f2, #7bc6ff);
+}
+
+/* Station Page Styles */
+.station-page {
+  min-height: 100vh;
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  background: linear-gradient(135deg, #0a0a0a 0%, #1a1a1a 50%, #2a2a2a 100%);
+}
+
+.animated-background {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  overflow: hidden;
+  pointer-events: none;
+}
+
+.star {
+  position: absolute;
+  width: 2px;
+  height: 2px;
+  background: #4A90E2;
+  border-radius: 50%;
+  animation: twinkle 3s ease-in-out infinite;
+}
+
+.star-1 { top: 10%; left: 10%; animation-delay: 0s; }
+.star-2 { top: 20%; left: 80%; animation-delay: 0.5s; }
+.star-3 { top: 30%; left: 20%; animation-delay: 1s; }
+.star-4 { top: 40%; left: 90%; animation-delay: 1.5s; }
+.star-5 { top: 50%; left: 60%; animation-delay: 2s; }
+.star-6 { top: 60%; left: 30%; animation-delay: 2.5s; }
+.star-7 { top: 70%; left: 70%; animation-delay: 3s; }
+.star-8 { top: 80%; left: 15%; animation-delay: 3.5s; }
+.star-9 { top: 90%; left: 85%; animation-delay: 4s; }
+.star-10 { top: 15%; left: 50%; animation-delay: 4.5s; }
+
+@keyframes twinkle {
+  0%, 100% { opacity: 0; transform: scale(1); }
+  50% { opacity: 1; transform: scale(1.2); }
+}
+
+.station-content {
+  position: relative;
+  z-index: 1;
+  padding: 40px;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  max-width: 1200px;
+  margin: 0 auto;
+  width: 100%;
+}
+
+.station-header {
+  text-align: center;
+  margin-bottom: 50px;
+  padding: 30px;
+  background: rgba(255, 255, 255, 0.02);
+  backdrop-filter: blur(20px);
+  border-radius: 20px;
+  border: 1px solid rgba(255, 255, 255, 0.1);
+}
+
+.station-header h1 {
+  font-size: 36px;
+  color: #4A90E2;
+  margin-bottom: 10px;
+  text-shadow: 0 2px 10px rgba(74, 144, 226, 0.3);
+}
+
+.station-subtitle {
+  font-size: 16px;
+  color: #a0a0a0;
+  margin-bottom: 20px;
+}
+
+.songs-section {
+  flex: 1;
+  background: rgba(255, 255, 255, 0.02);
+  backdrop-filter: blur(20px);
+  border-radius: 20px;
+  padding: 30px;
+  border: 1px solid rgba(255, 255, 255, 0.1);
+}
+
+.section-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 30px;
+  padding-bottom: 15px;
+  border-bottom: 2px solid rgba(74, 144, 226, 0.3);
+}
+
+.section-header h2 {
+  font-size: 24px;
+  color: #4A90E2;
+}
+
+.add-song-btn {
+  padding: 12px 24px;
+  background: linear-gradient(135deg, #4A90E2, #6BB6FF);
+  color: white;
+  border: none;
+  border-radius: 10px;
+  font-size: 14px;
+  font-weight: 600;
+  cursor: pointer;
+  transition: all 0.3s ease;
+}
+
+.add-song-btn:hover {
+  transform: translateY(-2px);
+  box-shadow: 0 8px 20px rgba(74, 144, 226, 0.3);
+}
+
+.songs-list {
+  display: flex;
+  flex-direction: column;
+  gap: 15px;
+}
+
+.empty-songs-state {
+  text-align: center;
+  padding: 60px 20px;
+  color: #a0a0a0;
+}
+
+.empty-songs-state p {
+  font-size: 16px;
+  margin: 0;
+}
+
+.song-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 15px;
+  background: rgba(255, 255, 255, 0.05);
+  border-radius: 12px;
+  border: 1px solid rgba(255, 255, 255, 0.1);
+  transition: all 0.3s ease;
+}
+
+.song-item:hover {
+  background: rgba(255, 255, 255, 0.1);
+  transform: translateY(-2px);
+}
+
+.song-info h4 {
+  font-size: 16px;
+  color: white;
+  margin-bottom: 5px;
+}
+
+.song-info p {
+  font-size: 14px;
+  color: #4A90E2;
+  margin: 0;
+}
+
+.song-duration {
+  font-size: 14px;
+  color: #ccc;
+  font-weight: bold;
+}
+
+/* Login Button Styles */
+.login-status {
+  display: flex;
+  align-items: center;
+  gap: 15px;
+  font-size: 14px;
+}
+
+.login-status span {
+  color: #34C759;
+  font-weight: 600;
+}
+
+.logout-btn {
+  padding: 8px 16px;
+  background: rgba(255, 255, 255, 0.1);
+  color: #fff;
+  border: 1px solid rgba(255, 255, 255, 0.2);
+  border-radius: 8px;
+  font-size: 12px;
+  cursor: pointer;
+  transition: all 0.3s ease;
+}
+
+.logout-btn:hover {
+  background: rgba(255, 255, 255, 0.2);
+  border-color: rgba(255, 255, 255, 0.3);
+}
+
+.spotify-login-btn {
+  padding: 12px 24px;
+  background: #1DB954;
+  color: white;
+  border: none;
+  border-radius: 10px;
+  font-size: 14px;
+  font-weight: 600;
+  cursor: pointer;
+  transition: all 0.3s ease;
+}
+
+.spotify-login-btn:hover {
+  background: #1ed760;
+  transform: translateY(-2px);
+  box-shadow: 0 8px 20px rgba(29, 185, 84, 0.3);
+}
+
 /* Add Song Modal Styles */
 .add-song-modal-backdrop {
   position: fixed;
@@ -792,7 +1389,7 @@ body {
   right: 0;
   bottom: 0;
   background: rgba(0, 0, 0, 0.8);
-  backdrop-filter: blur(8px);
+  backdrop-filter: blur(10px);
   display: flex;
   align-items: center;
   justify-content: center;
@@ -803,14 +1400,13 @@ body {
 .add-song-modal-content {
   background: linear-gradient(135deg, #2a2a2a 0%, #1a1a1a 50%, #0a0a0a 100%);
   border-radius: 20px;
-  width: 100%;
+  padding: 0;
   max-width: 600px;
+  width: 100%;
   max-height: 80vh;
+  overflow: hidden;
   border: 1px solid rgba(255, 255, 255, 0.1);
   box-shadow: 0 20px 40px rgba(0, 0, 0, 0.5);
-  display: flex;
-  flex-direction: column;
-  overflow: hidden;
 }
 
 .add-song-modal-header {
@@ -818,42 +1414,32 @@ body {
   justify-content: space-between;
   align-items: center;
   padding: 25px 30px;
-  border-bottom: 2px solid rgba(74, 144, 226, 0.3);
-  background: rgba(255, 255, 255, 0.02);
+  border-bottom: 1px solid rgba(255, 255, 255, 0.1);
 }
 
 .add-song-modal-header h2 {
-  font-size: 24px;
+  font-size: 20px;
   color: #4A90E2;
-  font-weight: bold;
   margin: 0;
 }
 
 .add-song-close-btn {
-  width: 40px;
-  height: 40px;
+  background: none;
   border: none;
-  border-radius: 50%;
-  background: rgba(255, 255, 255, 0.1);
-  color: #fff;
+  color: #ccc;
   cursor: pointer;
-  display: flex;
-  align-items: center;
-  justify-content: center;
+  padding: 5px;
+  border-radius: 5px;
   transition: all 0.3s ease;
 }
 
 .add-song-close-btn:hover {
-  background: rgba(255, 255, 255, 0.2);
-  transform: scale(1.1);
+  background: rgba(255, 255, 255, 0.1);
+  color: #fff;
 }
 
 .add-song-modal-body {
   padding: 30px;
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  min-height: 0;
 }
 
 .add-song-search-container {
@@ -866,7 +1452,7 @@ body {
   align-items: center;
 }
 
-.add-song-search-box .search-icon {
+.search-icon {
   position: absolute;
   left: 15px;
   color: #4A90E2;
@@ -891,52 +1477,43 @@ body {
   box-shadow: 0 0 0 3px rgba(74, 144, 226, 0.1);
 }
 
-.add-song-search-box input::placeholder {
-  color: #aaa;
-}
-
 .search-loading {
   position: absolute;
   right: 15px;
-  display: flex;
-  align-items: center;
-}
-
-.loading-spinner {
-  width: 20px;
-  height: 20px;
-  border: 2px solid rgba(74, 144, 226, 0.3);
-  border-top: 2px solid #4A90E2;
-  border-radius: 50%;
-  animation: spin 1s linear infinite;
 }
 
 .add-song-results-container {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  min-height: 300px;
-  overflow: hidden;
+  max-height: 400px;
+  overflow-y: auto;
+}
+
+.add-song-results-container::-webkit-scrollbar {
+  width: 6px;
+}
+
+.add-song-results-container::-webkit-scrollbar-track {
+  background: rgba(255, 255, 255, 0.1);
+  border-radius: 10px;
+}
+
+.add-song-results-container::-webkit-scrollbar-thumb {
+  background: #4A90E2;
+  border-radius: 10px;
 }
 
 .add-song-placeholder {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  flex: 1;
   text-align: center;
-  color: #aaa;
-  gap: 15px;
+  padding: 40px 20px;
+  color: #a0a0a0;
 }
 
 .add-song-placeholder svg {
+  margin-bottom: 15px;
   color: #4A90E2;
-  opacity: 0.6;
 }
 
 .add-song-placeholder p {
-  margin: 0;
+  margin: 0 0 5px 0;
   font-size: 16px;
 }
 
@@ -945,105 +1522,91 @@ body {
   color: #666 !important;
 }
 
+.add-song-error {
+  text-align: center;
+  padding: 20px;
+  background: rgba(255, 59, 48, 0.1);
+  border: 1px solid rgba(255, 59, 48, 0.3);
+  border-radius: 10px;
+  margin-bottom: 20px;
+}
+
+.add-song-error p {
+  color: #ff3b30;
+  margin: 0;
+  font-size: 14px;
+}
+
 .add-song-results-list {
   display: flex;
   flex-direction: column;
-  gap: 12px;
-  flex: 1;
-  overflow-y: auto;
-  padding-right: 10px;
-}
-
-.add-song-results-list::-webkit-scrollbar {
-  width: 6px;
-}
-
-.add-song-results-list::-webkit-scrollbar-track {
-  background: rgba(255, 255, 255, 0.1);
-  border-radius: 10px;
-}
-
-.add-song-results-list::-webkit-scrollbar-thumb {
-  background: #4A90E2;
-  border-radius: 10px;
+  gap: 10px;
 }
 
 .add-song-result-item {
   display: flex;
   align-items: center;
   padding: 15px;
-  background: rgba(255, 255, 255, 0.03);
+  background: rgba(255, 255, 255, 0.05);
   border-radius: 12px;
   border: 1px solid rgba(255, 255, 255, 0.1);
   transition: all 0.3s ease;
-  gap: 15px;
 }
 
 .add-song-result-item:hover {
-  background: rgba(255, 255, 255, 0.08);
+  background: rgba(255, 255, 255, 0.1);
   transform: translateY(-1px);
-  box-shadow: 0 5px 15px rgba(0, 0, 0, 0.2);
 }
 
 .result-song-cover {
   width: 50px;
   height: 50px;
   border-radius: 8px;
+  margin-right: 15px;
   object-fit: cover;
-  flex-shrink: 0;
 }
 
 .result-song-info {
   flex: 1;
-  min-width: 0;
 }
 
 .result-song-info h4 {
-  font-size: 16px;
-  margin: 0 0 5px 0;
+  font-size: 14px;
   color: white;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
+  margin: 0 0 3px 0;
 }
 
 .result-artist {
-  font-size: 14px;
+  font-size: 12px;
   color: #4A90E2;
-  margin: 0 0 3px 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
+  margin: 0 0 2px 0;
 }
 
 .result-album {
-  font-size: 12px;
+  font-size: 11px;
   color: #aaa;
   margin: 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
 }
 
 .add-song-btn {
   display: flex;
   align-items: center;
-  gap: 8px;
-  padding: 10px 16px;
+  gap: 5px;
+  padding: 8px 16px;
   background: linear-gradient(135deg, #4A90E2, #6BB6FF);
   color: white;
   border: none;
   border-radius: 8px;
-  font-size: 14px;
+  font-size: 12px;
   font-weight: 600;
   cursor: pointer;
   transition: all 0.3s ease;
-  flex-shrink: 0;
+  white-space: nowrap;
 }
 
 .add-song-btn:hover {
-  transform: scale(1.05);
-  box-shadow: 0 5px 15px rgba(74, 144, 226, 0.4);
+  transform: translateY(-1px);
+  box-shadow: 0 4px 12px rgba(74, 144, 226, 0.4);
 }
 
 /* Responsive Design */
@@ -1082,26 +1645,22 @@ body {
     min-height: 100vh;
   }
   
-  .home-vinyl-record {
-    width: 180px;
-    height: 180px;
-  }
-  
   .home-content {
-    padding: 30px 20px;
+    padding: 40px 30px;
+    margin: 20px;
   }
   
   .home-title {
-    font-size: 36px;
+    font-size: 32px;
   }
   
   .home-subtitle {
-    font-size: 16px;
+    font-size: 15px;
   }
   
-  .home-action-button {
-    padding: 15px 25px;
-    font-size: 14px;
+  .home-btn {
+    padding: 16px 28px;
+    font-size: 15px;
   }
   
   .create-station-main {
@@ -1138,6 +1697,43 @@ body {
     max-width: 100%;
     max-height: 90vh;
   }
+  
+  .join-station-main {
+    flex-direction: column;
+    padding: 20px;
+    gap: 40px;
+    height: auto;
+    min-height: 100vh;
+  }
+  
+  .join-station-vinyl-record {
+    width: 200px;
+    height: 200px;
+  }
+  
+  .join-station-content {
+    padding: 30px 20px;
+    max-width: 100%;
+  }
+  
+  .join-station-header h1 {
+    font-size: 28px;
+  }
+  
+  .station-card {
+    flex-direction: column;
+    gap: 15px;
+    text-align: center;
+  }
+  
+  .station-info {
+    margin-right: 0;
+  }
+  
+  .join-station-btn {
+    width: 100%;
+    justify-content: center;
+  }
 }
 
 @media (max-width: 480px) {
diff --git a/frontend/src/screens/CreateStation.jsx b/frontend/src/screens/CreateStation.jsx
index 80fbb32..dfe8152 100644
--- a/frontend/src/screens/CreateStation.jsx
+++ b/frontend/src/screens/CreateStation.jsx
@@ -1,15 +1,51 @@
 import React, { useState } from "react";
 import { createStation } from "../utils/StationsCreate";
-
-// I UNDERSTAND THIS!! --Noah
+import { useNavigate } from "react-router-dom";
 
 function CreateStation() {
+  const navigate = useNavigate();
   const [name, setName] = useState("");
   const [description, setDescription] = useState("");
   const [joinCode, setJoinCode] = useState("");
+  const [isLoading, setIsLoading] = useState(false);
+  const [error, setError] = useState("");
+  const [isCopied, setIsCopied] = useState(false);
 
-  const handleCreateStation = () => {
-    setJoinCode(createStation(name, description));
+  const handleCreateStation = async () => {
+    if (!name.trim() || !description.trim()) {
+      setError("Please fill in all fields");
+      return;
+    }
+
+    setIsLoading(true);
+    setError("");
+
+    try {
+      const code = await createStation(name, description);
+      setJoinCode(code);
+    } catch (error) {
+      setError(error.message || "Failed to create station");
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  const handleGoToStation = () => {
+    // Navigate to the station or home page
+    navigate("/");
+  };
+
+  const handleCopyCode = async () => {
+    try {
+      await navigator.clipboard.writeText(joinCode);
+      setIsCopied(true);
+      // Reset the animation after 2 seconds
+      setTimeout(() => {
+        setIsCopied(false);
+      }, 2000);
+    } catch (err) {
+      console.error('Failed to copy: ', err);
+    }
   };
 
   return (
@@ -37,25 +73,112 @@ function CreateStation() {
           <div className="create-station-content">
             <header className="create-station-header">
               <h1>Create a Station on Serena</h1>
+              <p className="create-station-subtitle">Start your own collaborative music experience</p>
             </header>
 
-      <main className="create-station-content">
-        <textarea onChange={(e) => setName(e.target.value)} />
-        <textarea onChange={(e) => setDescription(e.target.value)} />
+            {!joinCode ? (
+              <form className="create-station-form" onSubmit={(e) => e.preventDefault()}>
+                <div className="form-group">
+                  <label htmlFor="station-name">Station Name</label>
+                  <input
+                    id="station-name"
+                    type="text"
+                    placeholder="Enter your station name..."
+                    value={name}
+                    onChange={(e) => setName(e.target.value)}
+                    disabled={isLoading}
+                  />
+                </div>
 
-        <button
-          className="create-station-final-btn"
-          onClick={handleCreateStation}
-          disabled={!name || !description}
-        >
-          Create Radio Station
-        </button>
+                <div className="form-group">
+                  <label htmlFor="station-description">Description</label>
+                  <textarea
+                    id="station-description"
+                    placeholder="Describe your station's vibe..."
+                    value={description}
+                    onChange={(e) => setDescription(e.target.value)}
+                    disabled={isLoading}
+                    rows={4}
+                  />
+                </div>
 
-        <p>your joinCode: {joinCode}</p>
-      </main>
-    </div>
-    </div>
-    </div>
+                {error && (
+                  <div className="error-message">
+                    <svg width="20" height="20" viewBox="0 0 24 24" fill="currentColor">
+                      <path d="M12 2L13.09 8.26L22 9L13.09 9.74L12 16L10.91 9.74L2 9L10.91 8.26L12 2Z"/>
+                    </svg>
+                    {error}
+                  </div>
+                )}
+
+                <button
+                  type="button"
+                  className="create-station-final-btn"
+                  onClick={handleCreateStation}
+                  disabled={!name.trim() || !description.trim() || isLoading}
+                >
+                  {isLoading ? (
+                    <>
+                      <div className="loading-spinner"></div>
+                      Creating Station...
+                    </>
+                  ) : (
+                    <>
+                      <svg width="20" height="20" viewBox="0 0 24 24" fill="currentColor">
+                        <path d="M12 2L13.09 8.26L22 9L13.09 9.74L12 16L10.91 9.74L2 9L10.91 8.26L12 2Z"/>
+                      </svg>
+                      Create Radio Station
+                    </>
+                  )}
+                </button>
+              </form>
+            ) : (
+              <div className="success-state">
+                <div className="success-icon">
+                  <svg width="60" height="60" viewBox="0 0 24 24" fill="currentColor">
+                    <path d="M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z"/>
+                  </svg>
+                </div>
+                <h2>Station Created Successfully!</h2>
+                <p>Your station is ready to go. Share this join code with your friends:</p>
+                
+                <div className="join-code-display">
+                  <span className="join-code">{joinCode}</span>
+                  <button 
+                    className={`copy-btn ${isCopied ? 'copied' : ''}`}
+                    onClick={handleCopyCode}
+                  >
+                    {isCopied ? (
+                      <svg width="16" height="16" viewBox="0 0 24 24" fill="currentColor">
+                        <path d="M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z"/>
+                      </svg>
+                    ) : (
+                      <svg width="16" height="16" viewBox="0 0 24 24" fill="currentColor">
+                        <path d="M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12V1zm3 4H8c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h11c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2zm0 16H8V7h11v14z"/>
+                      </svg>
+                    )}
+                  </button>
+                </div>
+
+                {isCopied && (
+                  <div className="copy-feedback">
+                    <span className="copy-success-message">
+                      <svg width="16" height="16" viewBox="0 0 24 24" fill="currentColor">
+                        <path d="M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z"/>
+                      </svg>
+                      Copied to clipboard!
+                    </span>
+                  </div>
+                )}
+
+                <button className="go-to-station-btn" onClick={handleGoToStation}>
+                  Go to Home
+                </button>
+              </div>
+            )}
+          </div>
+        </div>
+      </div>
     </div>
   );
 }
diff --git a/frontend/src/screens/Home.jsx b/frontend/src/screens/Home.jsx
index c6637d5..247ab0b 100644
--- a/frontend/src/screens/Home.jsx
+++ b/frontend/src/screens/Home.jsx
@@ -14,25 +14,29 @@ function Home() {
 
   return (
     <div className="home-container">
-      <div className="content">
-        <h1 className="title">Radio Station Hub</h1>
-        <p className="subtitle">
-          Create or join a radio station to share music with friends
-        </p>
+      <div className="home-content">
+        <div className="home-header">
+          <h1 className="home-title">Serena Station Hub</h1>
+          <p className="home-subtitle">
+            Create or join a radio station to share music with friends
+          </p>
+        </div>
 
-        <div className="button-container">
+        <div className="home-actions">
           <button
-            className="action-button primary"
+            className="home-btn home-btn-primary"
             onClick={handleCreateStation}
           >
-            Create Radio Station
+            <span className="btn-icon">🎵</span>
+            Create Station
           </button>
 
           <button
-            className="action-button secondary"
+            className="home-btn home-btn-secondary"
             onClick={handleJoinStation}
           >
-            Join Radio Station
+            <span className="btn-icon">🎧</span>
+            Join Station
           </button>
         </div>
       </div>
diff --git a/frontend/src/screens/JoinStation.jsx b/frontend/src/screens/JoinStation.jsx
index 57d23ec..102347e 100644
--- a/frontend/src/screens/JoinStation.jsx
+++ b/frontend/src/screens/JoinStation.jsx
@@ -5,17 +5,23 @@ import { getStations } from "../utils/GetStations";
 function JoinStation() {
   const navigate = useNavigate();
   const [stations, setStations] = useState([]);
+  const [isLoading, setIsLoading] = useState(true);
 
   const handleJoinStation = (stationID) => {
-    // console.log("Joining station with ID:" + stationID);
-
     navigate(`/station/${stationID}`);
   };
 
   useEffect(() => {
     async function fetchStations() {
-      const result = await getStations();
-      setStations(result);
+      setIsLoading(true);
+      try {
+        const result = await getStations();
+        setStations(result);
+      } catch (error) {
+        console.error("Failed to fetch stations:", error);
+      } finally {
+        setIsLoading(false);
+      }
     }
     fetchStations();
   }, []);
@@ -40,28 +46,66 @@ function JoinStation() {
           </div>
         </div>
 
-        {/* Right Section - Join Station Form */}
+        {/* Right Section - Join Station Content */}
         <div className="join-station-right-section">
           <div className="join-station-content">
             <header className="join-station-header">
               <h1>Join a Station on Serena</h1>
+              <p className="join-station-subtitle">Connect to an existing collaborative music experience</p>
             </header>
 
-      <main className="join-station-content">
-        {stations.map((station, index) => {
-          return (
-            <div key={index}>
-              <p>Station Name: {station.name}</p>
-              <p>Station Description: {station.description}</p>
-              <button onClick={() => handleJoinStation(station.id)}>
-                join this station
-              </button>
+            <div className="join-station-body">
+              {isLoading ? (
+                <div className="loading-state">
+                  <div className="loading-spinner"></div>
+                  <p>Loading available stations...</p>
+                </div>
+              ) : stations.length === 0 ? (
+                <div className="empty-state">
+                  <div className="empty-icon">
+                    <svg width="60" height="60" viewBox="0 0 24 24" fill="currentColor">
+                      <path d="M12 3v10.55c-.59-.34-1.27-.55-2-.55-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4V7h4V3h-6z"/>
+                    </svg>
+                  </div>
+                  <h3>No stations available</h3>
+                  <p>There are currently no active stations to join. Create one to get started!</p>
+                  <button 
+                    className="create-station-btn"
+                    onClick={() => navigate('/create-station')}
+                  >
+                    Create Station
+                  </button>
+                </div>
+              ) : (
+                <div className="stations-grid">
+                  <h2>Available Stations</h2>
+                  <div className="stations-list">
+                    {stations.map((station, index) => (
+                      <div key={index} className="station-card">
+                        <div className="station-info">
+                          <h3>{station.name}</h3>
+                          <p className="station-description">{station.description}</p>
+                          <div className="station-meta">
+                            <span className="station-id">ID: {station.id}</span>
+                          </div>
+                        </div>
+                        <button 
+                          className="join-station-btn"
+                          onClick={() => handleJoinStation(station.id)}
+                        >
+                          <svg width="20" height="20" viewBox="0 0 24 24" fill="currentColor">
+                            <path d="M8 5v14l11-7z"/>
+                          </svg>
+                          Join Station
+                        </button>
+                      </div>
+                    ))}
+                  </div>
+                </div>
+              )}
             </div>
-          );
-        })}
-      </main>
-      </div>
-      </div>
+          </div>
+        </div>
       </div>
     </div>
   );
diff --git a/frontend/src/screens/StationPage.jsx b/frontend/src/screens/StationPage.jsx
index e487fd6..d280f5a 100644
--- a/frontend/src/screens/StationPage.jsx
+++ b/frontend/src/screens/StationPage.jsx
@@ -1,35 +1,130 @@
+import React, { useState } from "react";
 import { useParams } from "react-router-dom";
-import React, { useState, useEffect } from "react";
 import AddSongModal from "./AddSongModal";
 import LoginButton from "../components/LoginButton";
 import { addClientToStation } from "../utils/AddClientToStation";
 
 function StationPage() {
-  const { stationID } = useParams();
-  const [clientToken, setClientToken] = useState("");
+  const { id: stationId } = useParams();
+  const [setClientToken] = useState("");
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [accessDenied, setAccessDenied] = useState(true);
+  const [currentSong] = useState({ progress: 0, duration: 1 });
+  const [isLoading, setIsLoading] = useState(false);
+  const [error, setError] = useState("");
 
   const [userName, setUserName] = useState("");
   const [joinCode, setJoinCode] = useState("");
 
   const auth = async () => {
+    if (!userName.trim() || !joinCode.trim()) {
+      setError("Please fill in all fields");
+      return;
+    }
+
+    setIsLoading(true);
+    setError("");
+
     try {
       const token = await addClientToStation(userName, joinCode);
       setClientToken(token);
       setAccessDenied(false);
     } catch (error) {
       console.error("Auth failed:", error);
+      setError(error.message || "Failed to join station");
       setAccessDenied(true);
+    } finally {
+      setIsLoading(false);
     }
   };
 
   if (accessDenied) {
     return (
-      <div>
-        <textarea onChange={(e) => setUserName(e.target.value)} />
-        <textarea onChange={(e) => setJoinCode(e.target.value)} />
-        <button onClick={auth}>Access this RadioTower</button>
+      <div className="join-station-container">
+        <div className="join-station-main">
+          {/* Left Section - Vinyl Animation */}
+          <div className="join-station-left-section">
+            <div className="join-station-vinyl-container">
+              <div className="join-station-vinyl-record">
+                <div className="vinyl-center"></div>
+                <div className="vinyl-grooves"></div>
+              </div>
+              
+              {/* Animated Music Notes */}
+              <div className="join-station-music-notes">
+                <div className="music-note note-1">♪</div>
+                <div className="music-note note-2">♫</div>
+                <div className="music-note note-3">♪</div>
+              </div>
+            </div>
+          </div>
+
+          {/* Right Section - Authentication Form */}
+          <div className="join-station-right-section">
+            <div className="join-station-content">
+              <header className="join-station-header">
+                <h1>Join Station {stationId}</h1>
+                <p className="join-station-subtitle">Enter your details to access this collaborative music experience</p>
+              </header>
+
+              <form className="create-station-form" onSubmit={(e) => e.preventDefault()}>
+                <div className="form-group">
+                  <label htmlFor="user-name">Your Name</label>
+                  <input
+                    id="user-name"
+                    type="text"
+                    placeholder="Enter your name..."
+                    value={userName}
+                    onChange={(e) => setUserName(e.target.value)}
+                    disabled={isLoading}
+                  />
+                </div>
+
+                <div className="form-group">
+                  <label htmlFor="join-code">Join Code</label>
+                  <input
+                    id="join-code"
+                    type="text"
+                    placeholder="Enter the station join code..."
+                    value={joinCode}
+                    onChange={(e) => setJoinCode(e.target.value)}
+                    disabled={isLoading}
+                  />
+                </div>
+
+                {error && (
+                  <div className="error-message">
+                    <svg width="20" height="20" viewBox="0 0 24 24" fill="currentColor">
+                      <path d="M12 2L13.09 8.26L22 9L13.09 9.74L12 16L10.91 9.74L2 9L10.91 8.26L12 2Z"/>
+                    </svg>
+                    {error}
+                  </div>
+                )}
+
+                <button
+                  type="button"
+                  className="create-station-final-btn"
+                  onClick={auth}
+                  disabled={!userName.trim() || !joinCode.trim() || isLoading}
+                >
+                  {isLoading ? (
+                    <>
+                      <div className="loading-spinner"></div>
+                      Joining Station...
+                    </>
+                  ) : (
+                    <>
+                      <svg width="20" height="20" viewBox="0 0 24 24" fill="currentColor">
+                        <path d="M8 5v14l11-7z"/>
+                      </svg>
+                      Join RadioTower
+                    </>
+                  )}
+                </button>
+              </form>
+            </div>
+          </div>
+        </div>
       </div>
     );
   }

From 3418aa5ab1745356139ad62692749e5e383a1dd2 Mon Sep 17 00:00:00 2001
From: Tobias <stbuctob@bx.fallmerayer.it>
Date: Sat, 2 Aug 2025 13:16:33 +0200
Subject: [PATCH 4/4] .

---
 frontend/src/components/AudioPlayer.jsx | 5 +++++
 frontend/src/screens/StationPage.jsx    | 7 ++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/AudioPlayer.jsx b/frontend/src/components/AudioPlayer.jsx
index e8fea80..2c3eea2 100644
--- a/frontend/src/components/AudioPlayer.jsx
+++ b/frontend/src/components/AudioPlayer.jsx
@@ -4,6 +4,11 @@ const SingleAudioPlayer = ({ src }) => {
   const audioRef = useRef(null);
   const [isPlaying, setIsPlaying] = useState(false);
 
+  // Early return if no src provided
+  if (!src) {
+    return <div>No audio file available</div>;
+  }
+
   const togglePlay = () => {
     const audio = audioRef.current;
     if (!audio) return;
diff --git a/frontend/src/screens/StationPage.jsx b/frontend/src/screens/StationPage.jsx
index 577ae0a..bb4acb1 100644
--- a/frontend/src/screens/StationPage.jsx
+++ b/frontend/src/screens/StationPage.jsx
@@ -1,4 +1,3 @@
-import React, { useState } from "react";
 import { useParams } from "react-router-dom";
 import React, { useState, useEffect } from "react";
 import { addClientToStation } from "../utils/AddClientToStation";
@@ -63,7 +62,7 @@ function StationPage() {
           <div className="join-station-right-section">
             <div className="join-station-content">
               <header className="join-station-header">
-                <h1>Join Station {stationId}</h1>
+                <h1>Join Station {stationID}</h1>
                 <p className="join-station-subtitle">Enter your details to access this collaborative music experience</p>
               </header>
 
@@ -144,7 +143,9 @@ function StationPage() {
           <h1>Serena Station</h1>
           <p className="station-subtitle">Collaborative Music Experience</p>
         </header>
-        <SingleAudioPlayer src={recommendedSongs[0]}></SingleAudioPlayer>
+        {recommendedSongs.length > 0 && (
+          <SingleAudioPlayer src={recommendedSongs[0]}></SingleAudioPlayer>
+        )}
 
         <div className="songs-section">
           <div className="section-header">