diff --git a/src/routes/Details/AssetDetails.tsx b/src/routes/Details/AssetDetails.tsx
index 6fbb152..bfc2617 100644
--- a/src/routes/Details/AssetDetails.tsx
+++ b/src/routes/Details/AssetDetails.tsx
@@ -11,41 +11,36 @@ interface AssetDetailsProps {
 export default class AssetDetails extends PureComponent<AssetDetailsProps> {
     public render() {
         const { metadata, ddo, purchaseAsset } = this.props
+        const { base } = metadata
 
         return (
             <>
                 <aside className={styles.metaPrimary}>
                     <h2 className={styles.copyrightHolder}>
-                        {metadata.base.copyrightHolder}
+                        {base.copyrightHolder}
                     </h2>
                     <div className={styles.metaPrimaryData}>
-                        <span>{metadata.base.dateCreated}</span>
+                        <span>{base.dateCreated}</span>
                         <span>json</span>
                         <span>18.5 MB</span>
-                        {metadata.base.categories && (
-                            <span>{metadata.base.categories[0]}</span>
-                        )}
+                        {base.categories && <span>{base.categories[0]}</span>}
                     </div>
                 </aside>
 
-                <div>{metadata.base.description}</div>
+                <div>{base.description}</div>
 
                 <ul className={styles.meta}>
                     <li>
                         <span className={styles.metaLabel}>
                             <strong>Author</strong>
                         </span>
-                        <span className={styles.metaValue}>
-                            {metadata.base.author}
-                        </span>
+                        <span className={styles.metaValue}>{base.author}</span>
                     </li>
                     <li>
                         <span className={styles.metaLabel}>
                             <strong>License</strong>
                         </span>
-                        <span className={styles.metaValue}>
-                            {metadata.base.license}
-                        </span>
+                        <span className={styles.metaValue}>{base.license}</span>
                     </li>
                     <li>
                         <span className={styles.metaLabel}>
diff --git a/src/routes/Details/index.tsx b/src/routes/Details/index.tsx
index 8680ac2..176d4f5 100644
--- a/src/routes/Details/index.tsx
+++ b/src/routes/Details/index.tsx
@@ -1,13 +1,14 @@
-import { Logger } from '@oceanprotocol/squid'
 import React, { Component } from 'react'
+import { Logger } from '@oceanprotocol/squid'
+import queryString from 'query-string'
 import Route from '../../components/templates/Route'
+import Spinner from '../../components/atoms/Spinner'
 import { User } from '../../context/User'
-import quertString from 'query-string'
 import AssetDetails from './AssetDetails'
 
 interface DetailsState {
     ddo: any
-    metadata: any
+    metadata: { base: { name: string } }
 }
 
 interface DetailsProps {
@@ -16,14 +17,14 @@ interface DetailsProps {
 }
 
 export default class Details extends Component<DetailsProps, DetailsState> {
-    public state = { ddo: {}, metadata: {} }
+    public state = { ddo: {}, metadata: { base: { name: '' } } }
 
     public async componentDidMount() {
         const ddo = await this.context.ocean.resolveDID(
             this.props.match.params.did
         )
         const { metadata } = ddo.findServiceByType('Metadata')
-        this.setState({ ddo, metadata })
+        this.setState({ ddo, metadata: { base: metadata.base } })
     }
 
     private purchaseAsset = async (ddo: any) => {
@@ -42,7 +43,7 @@ export default class Details extends Component<DetailsProps, DetailsState> {
                 serviceAgreementSignatureResult.serviceAgreementSignature,
                 (files: any) => {
                     files.forEach((file: any) => {
-                        const parsedUrl: any = quertString.parseUrl(file)
+                        const parsedUrl: any = queryString.parseUrl(file)
                         setTimeout(() => {
                             // eslint-disable-next-line
                             window.open(parsedUrl.query.url)
@@ -58,18 +59,19 @@ export default class Details extends Component<DetailsProps, DetailsState> {
 
     public render() {
         const { metadata, ddo } = this.state
-        const { base } = metadata
 
         return (
-            <Route title={metadata && base ? base.name : 'Loading Details'}>
-                {metadata ? (
+            <Route
+                title={metadata.base ? metadata.base.name : 'Loading Details'}
+            >
+                {metadata && metadata.base.name ? (
                     <AssetDetails
                         metadata={metadata}
                         ddo={ddo}
                         purchaseAsset={this.purchaseAsset}
                     />
                 ) : (
-                    <div>Loading</div>
+                    <Spinner message={'Loading asset...'} />
                 )}
             </Route>
         )
diff --git a/tsconfig.json b/tsconfig.json
index 0980b23..2f4d2c3 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,11 +1,7 @@
 {
   "compilerOptions": {
     "target": "es5",
-    "lib": [
-      "dom",
-      "dom.iterable",
-      "esnext"
-    ],
+    "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,
     "esModuleInterop": true,
@@ -19,7 +15,5 @@
     "noEmit": true,
     "jsx": "preserve"
   },
-  "include": [
-    "src"
-  ]
+  "include": ["src"]
 }