diff --git a/packages/frontend/src/pages/Configuration.tsx b/packages/frontend/src/pages/Configuration.tsx
index 51df143..46cef30 100644
--- a/packages/frontend/src/pages/Configuration.tsx
+++ b/packages/frontend/src/pages/Configuration.tsx
@@ -1,9 +1,35 @@
-import { Box, Heading, VStack, Text, Button, OrderedList, ListItem, useDisclosure, Modal, ModalOverlay, ModalContent, ModalHeader, ModalBody, ModalFooter, useToast, IconButton, Flex } from "@chakra-ui/react";
+import { 
+  Box, 
+  Heading, 
+  VStack, 
+  Text, 
+  Button, 
+  OrderedList, 
+  ListItem, 
+  useDisclosure, 
+  Modal, 
+  ModalOverlay, 
+  ModalContent, 
+  ModalHeader, 
+  ModalBody, 
+  ModalFooter, 
+  useToast, 
+  IconButton, 
+  Flex,
+  Tabs,
+  TabList,
+  TabPanels,
+  Tab,
+  TabPanel,
+  Icon,
+  HStack,
+} from "@chakra-ui/react";
 import { ChevronLeftIcon } from "@chakra-ui/icons";
+import { FiDatabase, FiSettings } from 'react-icons/fi';
 import { useNavigate } from "react-router-dom";
 import { useXmlParser } from "../hooks/useXmlParser";
-
 import { StyledFileInput } from "../components/StyledFileInput";
+import { S3Configuration } from "./S3Configuration";
 import { api } from "../services/api";
 
 export function Configuration() {
@@ -57,7 +83,7 @@ export function Configuration() {
         },
       }}
     >
-      <VStack spacing={8} align="stretch" maxW="2xl" mx="auto">
+      <VStack spacing={8} align="stretch" maxW="4xl" mx="auto">
         <Flex align="center" gap={4}>
           <IconButton
             icon={<ChevronLeftIcon boxSize={6} />}
@@ -70,51 +96,74 @@ export function Configuration() {
           <Heading size="lg">Configuration</Heading>
         </Flex>
         
-        <Box bg="gray.800" p={6} borderRadius="lg" borderWidth="1px" borderColor="gray.700">
-          <Heading size="md" mb={4}>Library Management</Heading>
-          
-          <VStack spacing={6} align="stretch">
-            <Box>
-              <Text color="gray.400" mb={4}>
-                To get started with Rekordbox Reader, you'll need to export your library from Rekordbox and import it here.
-              </Text>
-              
-              <OrderedList spacing={3} color="gray.400" mb={6}>
-                <ListItem>
-                  Open Rekordbox and go to <Text as="span" color="gray.300" fontWeight="medium">File → Export Collection in xml format</Text>
-                </ListItem>
-                <ListItem>
-                  Choose a location to save your XML file
-                </ListItem>
-                <ListItem>
-                  Click the button below to import your Rekordbox XML file
-                </ListItem>
-              </OrderedList>
-            </Box>
+        <Tabs variant="enclosed" colorScheme="blue">
+          <TabList bg="gray.800" borderColor="gray.700">
+            <Tab color="gray.300" _selected={{ bg: "gray.700", color: "white", borderColor: "gray.600" }}>
+              <HStack spacing={2}>
+                <Icon as={FiDatabase} />
+                <Text>Library Management</Text>
+              </HStack>
+            </Tab>
+            <Tab color="gray.300" _selected={{ bg: "gray.700", color: "white", borderColor: "gray.600" }}>
+              <HStack spacing={2}>
+                <Icon as={FiSettings} />
+                <Text>S3 Configuration</Text>
+              </HStack>
+            </Tab>
+          </TabList>
 
-            <Box>
-              <Text fontWeight="medium" mb={2}>Import Library</Text>
-              <StyledFileInput />
-            </Box>
-            
+          <TabPanels>
+            {/* Library Management Tab */}
+            <TabPanel bg="gray.800" p={6} borderRadius="lg" borderWidth="1px" borderColor="gray.700">
+              <VStack spacing={6} align="stretch">
+                <Box>
+                  <Text color="gray.400" mb={4}>
+                    To get started with Rekordbox Reader, you'll need to export your library from Rekordbox and import it here.
+                  </Text>
+                  
+                  <OrderedList spacing={3} color="gray.400" mb={6}>
+                    <ListItem>
+                      Open Rekordbox and go to <Text as="span" color="gray.300" fontWeight="medium">File → Export Collection in xml format</Text>
+                    </ListItem>
+                    <ListItem>
+                      Choose a location to save your XML file
+                    </ListItem>
+                    <ListItem>
+                      Click the button below to import your Rekordbox XML file
+                    </ListItem>
+                  </OrderedList>
+                </Box>
 
+                <Box>
+                  <Text fontWeight="medium" mb={2}>Import Library</Text>
+                  <StyledFileInput />
+                </Box>
 
-            <Box borderTopWidth="1px" borderColor="gray.700" pt={6} mt={4}>
-              <Text fontWeight="medium" mb={2}>Reset Database</Text>
-              <Text color="gray.400" mb={4}>
-                Clear all songs and playlists from the database. This action cannot be undone.
-              </Text>
-              <Button 
-                onClick={onOpen}
-                width="full"
-                colorScheme="red"
-                variant="outline"
-              >
-                Reset Database
-              </Button>
-            </Box>
-          </VStack>
-        </Box>
+                <Box borderTopWidth="1px" borderColor="gray.700" pt={6} mt={4}>
+                  <Text fontWeight="medium" mb={2}>Reset Database</Text>
+                  <Text color="gray.400" mb={4}>
+                    Clear all songs and playlists from the database. This action cannot be undone.
+                  </Text>
+                  <Button 
+                    onClick={onOpen}
+                    width="full"
+                    colorScheme="red"
+                    variant="outline"
+                  >
+                    Reset Database
+                  </Button>
+                </Box>
+              </VStack>
+            </TabPanel>
+
+            {/* S3 Configuration Tab */}
+            <TabPanel bg="gray.800" p={0}>
+              <Box p={6}>
+                <S3Configuration />
+              </Box>
+            </TabPanel>
+          </TabPanels>
+        </Tabs>
       </VStack>
 
       {/* Reset Database Confirmation Modal */}
diff --git a/packages/frontend/src/pages/MusicStorage.tsx b/packages/frontend/src/pages/MusicStorage.tsx
index 8eedb49..32c22b3 100644
--- a/packages/frontend/src/pages/MusicStorage.tsx
+++ b/packages/frontend/src/pages/MusicStorage.tsx
@@ -25,7 +25,6 @@ import {
 import { FiPlay, FiTrash2, FiMusic, FiRefreshCw } from 'react-icons/fi';
 import { MusicUpload } from '../components/MusicUpload';
 import { SongMatching } from '../components/SongMatching';
-import { S3Configuration } from './S3Configuration';
 import { useMusicPlayer } from '../contexts/MusicPlayerContext';
 import type { Song } from '../types/interfaces';
 
@@ -241,9 +240,6 @@ export const MusicStorage: React.FC = () => {
             <Tab color="gray.300" _selected={{ bg: "gray.700", color: "white", borderColor: "gray.600" }}>
               Song Matching
             </Tab>
-            <Tab color="gray.300" _selected={{ bg: "gray.700", color: "white", borderColor: "gray.600" }}>
-              S3 Configuration
-            </Tab>
           </TabList>
 
           <TabPanels flex={1} overflow="hidden">
@@ -382,11 +378,6 @@ export const MusicStorage: React.FC = () => {
             <TabPanel bg="gray.900" height="100%" overflowY="auto">
               <SongMatching />
             </TabPanel>
-
-            {/* S3 Configuration Tab */}
-            <TabPanel bg="gray.900" height="100%" overflowY="auto">
-              <S3Configuration />
-            </TabPanel>
           </TabPanels>
         </Tabs>
       </VStack>