diff --git a/pages/teacher/[person].jsx b/pages/teacher/[person].tsx
similarity index 62%
rename from pages/teacher/[person].jsx
rename to pages/teacher/[person].tsx
index 89865c51..84f5b440 100644
--- a/pages/teacher/[person].jsx
+++ b/pages/teacher/[person].tsx
@@ -1,34 +1,52 @@
 import React from 'react'
 import Head from 'next/head'
 import { App } from '../../src/components/App'
-import { Page } from '../../src/components/Page'
+import Article from '../../src/components/Article'
 import { Meta } from '../../src/components/Meta'
 import menuModel from '../../src/models/menu'
 import { buildMenu } from '../../src/lib/menu'
 import { meta } from '../../src/lib/meta'
 import { createApiUrl, requestGet, wrapInitialProps } from '../../src/next-lib'
+import { NextPage } from 'next'
+import { IMeta } from '../../src/types'
+import Html from '../../src/components/Html'
 
-const Index = (props) => (
+interface IProps {
+    pageUrl: string
+    title: string
+    meta: IMeta
+    person: any
+}
+
+const Index: NextPage<IProps> = props => (
     <App
         menu={buildMenu(props.pageUrl, menuModel)}
         showAuthor={true}
         menuPadding={true}
-        layout={'wide'}
+        layout={'thin'}
     >
         <Head>
             <title>{props.title}</title>
             <Meta meta={props.meta} />
         </Head>
-        <Page shareable={true}>
-            {props.person.post}
-        </Page>
+
+        <Article
+            title={''}
+            tags={[]}
+            date={null}
+            shareable={true}
+        >
+            <Html
+                html={props.person.post}
+            />
+        </Article>
     </App>
 )
 
 Index.getInitialProps = wrapInitialProps(async (ctx) => {
     const pageUrl = '/collective'
     const id = ctx.query.person
-    const person = await requestGet(createApiUrl(ctx.req, `/api/persons/${id}`), {})
+    const person: any = await requestGet(createApiUrl(ctx.req, `/api/persons/${id}`), {})
     const name = person.name || []
     const title = name.join(' ')
     const image = person.preview ? person.preview.artifacts.fb : {}
@@ -46,4 +64,4 @@ Index.getInitialProps = wrapInitialProps(async (ctx) => {
     }
 })
 
-export default Index
\ No newline at end of file
+export default Index