diff --git a/src/components/Disc.jsx b/src/components/Disc.jsx
index 474c9d4..4aaa91a 100644
--- a/src/components/Disc.jsx
+++ b/src/components/Disc.jsx
@@ -1,46 +1,34 @@
-import React, {useEffect, useState} from 'react';
+import React, {Fragment, useEffect, useState} from 'react';
 // import queryString from "query-string";
 import {getDisc} from "../services/entity_service";
 import {CoverArt} from "./CoverArt";
-import './Disc.scss';
+import {Entity} from "./Entity";
 
 const Disc = (props) => {
-    const disc = props.disc;
-    if (disc) {
-        return (
-            <div className='disc'>
-                <div className='space-between'>
-                    <div className='title'>
-                        <h1>{disc.title}</h1>
-                        {/*<h4>{disc.artist[0].name}</h4>*/}
-                        <button className='button'>Agregar a mi Lista</button>
-                    </div>
-                    <div className='cover-container'>
-                        <CoverArt disc={disc}/>
-                    </div>
-                </div>
-            </div>
-        )
-    } else {
-        return <></>
-    }
+  const disc = props.disc;
+  if (disc){
+    return <Entity title={disc.title}
+      subtitle={disc.artist.name}
+      buttonText='Agregar a mi lista'
+      cover={<CoverArt disc={disc}/>}/>
+  }else {
+    return <Fragment></Fragment>
+  }
 }
 
 export const DiscView = (props) => {
-    // const parsedParams = queryString.parse(props.location.search);
-    const mbid = props.match.params.mbid;
+  // const parsedParams = queryString.parse(props.location.search);
+  const mbid = props.match.params.mbid;
 
-    const [disc, setDisc] = useState(null);
+  const [disc, setDisc] = useState(null);
 
-    useEffect(() => {
-        if (mbid) {
-            getDisc(mbid).then((result) => setDisc(result));
-        }
-    }, [mbid])
+  useEffect(() => {
+    if (mbid) {
+      getDisc(mbid).then((result) => setDisc(result));
+    }
+  }, [mbid])
 
-
-
-    return (
-        <Disc disc={disc}/>
-    )
+  return (
+    <Disc disc={disc}/>
+  )
 }
diff --git a/src/components/Disc.scss b/src/components/Disc.scss
deleted file mode 100644
index 8ef7bcc..0000000
--- a/src/components/Disc.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-.disc {
-  .title {
-    h1 {
-      margin-bottom: 0
-    }
-    h4 {
-      margin-top: 0;
-      margin-bottom: .5em
-    }
-  }
-
-  .cover-container {
-    width: 250px;
-    height: 250px;
-    min-width: 250px;
-    margin-top: 1em;
-  }
-}