diff --git a/dataBaseSchema.sql b/dataBaseSchema.sql
index 7703b73..d451188 100644
--- a/dataBaseSchema.sql
+++ b/dataBaseSchema.sql
@@ -91,8 +91,7 @@ ALTER TABLE certification OWNER TO postgres;
 CREATE TABLE post (
     id uuid DEFAULT public.gen_random_uuid() NOT NULL,
     content text,
-    created_on timestamp without time zone DEFAULT timezone('utc'::text, now()),
-    title character varying(255)
+    created_on timestamp without time zone DEFAULT timezone('utc'::text, now())
 );
 
 
@@ -130,6 +129,7 @@ CREATE TABLE "user" (
 
 ALTER TABLE "user" OWNER TO postgres;
 
+
 --
 -- Data for Name: user; Type: TABLE DATA; Schema: open_certification_trainer; Owner: postgres
 --
@@ -284,4 +284,3 @@ GRANT ALL ON TABLE "user" TO dev;
 
 --
 -- PostgreSQL database dump complete
---
diff --git a/src/components/Assessment.tsx b/src/components/Assessment.tsx
index eddd8e2..c630726 100644
--- a/src/components/Assessment.tsx
+++ b/src/components/Assessment.tsx
@@ -145,6 +145,10 @@ export default class Assessment extends React.Component<IBaseProps, AssessmentSt
   shuffle<T>(array: Array<T>): void {
     let j, x, i;
 
+    if (!array) {
+      return;
+    }
+
     for (i = array.length - 1; i > 0; i--) {
         j = Math.floor(Math.random() * (i + 1));
         x = array[i];
@@ -153,7 +157,9 @@ export default class Assessment extends React.Component<IBaseProps, AssessmentSt
     }
   }
 
-  shuffleAnswers(certification: Certification) {
+  shuffleCertification(certification: Certification) {
+    this.shuffle<Question>(certification.questions);
+
     for (let i = 0; certification.questions && i < certification.questions.length; i++) {
       let question = certification.questions[i];
 
@@ -175,7 +181,7 @@ export default class Assessment extends React.Component<IBaseProps, AssessmentSt
         return results.json();
       })
       .then(data => {
-        this.shuffleAnswers(data);
+        this.shuffleCertification(data);
 
         this.setState({certification: data as Certification, session: this.getDefaultState().session, activeQuestion: 0});
       });
@@ -333,6 +339,7 @@ export default class Assessment extends React.Component<IBaseProps, AssessmentSt
 
             content = (
               <div>
+                <p style={{"text-align": "right"}}>Version {this.state.certification.version}</p>
                 <h1>{this.state.certification.name}</h1>
                 <ProgressBar striped now={progress} />
                 <QuestionView checkedAnswers={this.state.checkedAnswers} onAnswerChange={this.answerChangedHandler} question={activeQuestion} key={activeQuestion.id} highlightCorrectAnswers={this.state.checkingAnswers} highlightIncorrectAnswers={this.state.checkingAnswers} answersDisabled={this.state.checkingAnswers} />
diff --git a/src/components/CertificationManagement.tsx b/src/components/CertificationManagement.tsx
index 81c8fcc..6294851 100644
--- a/src/components/CertificationManagement.tsx
+++ b/src/components/CertificationManagement.tsx
@@ -47,6 +47,7 @@ export default class CertificationManagement extends React.Component<IBaseProps,
       this.reset = this.reset.bind(this);
       this.save = this.save.bind(this);
       this.onNameChange = this.onNameChange.bind(this);
+      this.onVersionChange = this.onVersionChange.bind(this);
       this.onQuestionChange = this.onQuestionChange.bind(this);
       this.addQuestion = this.addQuestion.bind(this);
       this.addMultipleQuestions = this.addMultipleQuestions.bind(this);
@@ -258,6 +259,16 @@ export default class CertificationManagement extends React.Component<IBaseProps,
     });
   }
 
+  onVersionChange(e: any){
+    let cert = this.state.certification;
+    let newVersion = e.target.value;
+    let update = {...cert, version: newVersion};
+
+    this.setState({
+      certification: update
+    });
+  }
+
   onPublishedChange(e: any){
     let cert = this.state.certification;
     let isPublished = e.target.checked;
@@ -362,6 +373,11 @@ export default class CertificationManagement extends React.Component<IBaseProps,
               control={{type: "text", disabled: this.props.match.params.courseName !== "new", value: this.state.certification.uniqueName, onChange: this.onUniqueNameChange}}
               label="Certification Unique Name"
             />
+            <FieldGroup
+              id={this.state.certification.id + "version"}
+              control={{type: "text", value: this.state.certification.version, onChange: this.onVersionChange}}
+              label="Version"
+            />
             <Checkbox key={this.state.certification.id + "_isPublished"} checked={this.state.certification.isPublished} onChange={this.onPublishedChange}>Is Published</Checkbox>
             {this.state.certification.questions ? (this.state.certification.questions.map((q, index) =>
               (<QuestionEditView onQuestionChange={(q: Question) => this.onQuestionChange(index, q)} requestDeletion={() => this.deleteQuestion(index)} question={q} key={q.id} />)
diff --git a/src/components/CertificationOverview.tsx b/src/components/CertificationOverview.tsx
index 26d92ae..a7f6b26 100644
--- a/src/components/CertificationOverview.tsx
+++ b/src/components/CertificationOverview.tsx
@@ -77,6 +77,7 @@ export default class CertificationOverview extends React.Component<IBaseProps, C
       if (this.state.certification){
         content = (
           <div>
+          <p style={{"text-align": "right"}}>Version {this.state.certification.version}</p>
             <h1>{this.state.certification.name}</h1>
             {this.state.certification.questions ? (this.state.certification.questions.map(q =>
               (<QuestionView question={q} key={q.id} highlightCorrectAnswers={true} highlightIncorrectAnswers={false} answersDisabled={true} />)
diff --git a/src/components/PortalManagement.tsx b/src/components/PortalManagement.tsx
index ed2c8f0..f92d0c9 100644
--- a/src/components/PortalManagement.tsx
+++ b/src/components/PortalManagement.tsx
@@ -21,49 +21,6 @@ export default class PortalManagement extends React.Component<IBaseProps, Portal
         posts: [],
         postInput: "Demo"
       };
-
-      this.setInput = this.setInput.bind(this);
-      this.fetchUsers = this.fetchUsers.bind(this);
-      this.fetchPosts = this.fetchPosts.bind(this);
-    }
-
-    fetchUsers(){
-      return fetch("/userList",
-      {
-        credentials: 'include'
-      })
-      .then(results => {
-        return results.json();
-      })
-      .then((users: Array<DbUser>) => {
-          this.setState({
-              users: users
-          });
-      });
-    }
-
-    fetchPosts(){
-      return fetch("/posts",
-      {
-        credentials: 'include'
-      })
-      .then(results => {
-        return results.json();
-      })
-      .then((posts: Array<DbPost>) => {
-          this.setState({
-              posts: posts
-          });
-      });
-    }
-
-    componentDidMount(){
-      this.fetchUsers();
-      this.fetchPosts();
-    }
-
-    setInput(e: any) {
-      this.setState({postInput: e.target.value});
     }
 
     render(){
@@ -87,36 +44,13 @@ export default class PortalManagement extends React.Component<IBaseProps, Portal
               <Well>
                 <Tab.Content animation>
                   <Tab.Pane eventKey="users">
-                    <Table striped bordered condensed hover>
-                      <thead>
-                          <tr>
-                              <th>Username</th>
-                              <th>First Name</th>
-                              <th>Last Name</th>
-                              <th>E-Mail</th>
-                              <th>Is Admin</th>
-                          </tr>
-                      </thead>
-                      <tbody>
-                        {this.state.users.map(u => { return (<UserListView key={u.id} user={u} />)})}
-                      </tbody>
-                      </Table>
+                    <UserListView />
                   </Tab.Pane>
                   <Tab.Pane eventKey="groups">
                     <Jumbotron><h2>Groups - In construction</h2></Jumbotron>
                   </Tab.Pane>
                   <Tab.Pane eventKey="posts">
-                  <Table striped bordered condensed hover>
-                    <thead>
-                        <tr>
-                            <th>Title</th>
-                            <th>Created On</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                      {this.state.posts.map(p => { return (<PostListView key={p.id} post={p} />)})}
-                    </tbody>
-                    </Table>
+                    <PostListView />
                   </Tab.Pane>
                 </Tab.Content>
               </Well>
diff --git a/src/components/PostEditView.tsx b/src/components/PostEditView.tsx
index d0caab9..e5a9d51 100644
--- a/src/components/PostEditView.tsx
+++ b/src/components/PostEditView.tsx
@@ -4,6 +4,8 @@ import DbPost from "../model/DbPost";
 import IBaseProps from "../domain/IBaseProps";
 import * as ReactMarkdown from "react-markdown";
 import MessageBar from "./MessageBar";
+import * as CodeMirror from "react-codemirror";
+import * as uuid from "uuid/v4";
 
 interface PostEditViewState {
   post: DbPost;
@@ -24,6 +26,7 @@ export default class PostEditView extends React.PureComponent<IBaseProps, PostEd
         this.retrievePost = this.retrievePost.bind(this);
         this.markdownChanged = this.markdownChanged.bind(this);
         this.save = this.save.bind(this);
+        this.delete = this.delete.bind(this);
     }
 
     componentDidMount(){
@@ -33,6 +36,12 @@ export default class PostEditView extends React.PureComponent<IBaseProps, PostEd
     retrievePost(){
       let postId = this.props.match.params.postId;
 
+      if (postId === "new") {
+        return this.setState({
+          post: {...this.state.post, id: uuid()}
+        });
+      }
+
       fetch(`/posts/${postId}`,
       {
         credentials: 'include'
@@ -53,19 +62,40 @@ export default class PostEditView extends React.PureComponent<IBaseProps, PostEd
       });
     }
 
+    delete(){
+      let postId = this.state.post.id;
+
+      fetch(`/posts/${postId}`,
+      {
+        method: "DELETE",
+        credentials: 'include'
+      })
+      .then(() => {
+          this.setState({
+              errors: [],
+              message: "Successfully deleted post"
+          });
+      })
+      .catch(err => {
+        this.setState({
+          errors: [err]
+        });
+      });
+    }
+
     save(){
-      let postId = this.props.match.params.postId;
+      let postId = this.state.post.id;
+      let headers = new Headers();
+      headers.set("Content-Type", "application/json");
 
       fetch(`/posts/${postId}`,
       {
         method: "POST",
         credentials: 'include',
-        body: JSON.stringify(this.state.post)
+        body: JSON.stringify(this.state.post),
+        headers: headers
       })
-      .then(results => {
-        return results.json();
-      })
-      .then((posts: Array<DbPost>) => {
+      .then(() => {
           this.setState({
               errors: [],
               message: "Successfully saved post"
@@ -90,16 +120,17 @@ export default class PostEditView extends React.PureComponent<IBaseProps, PostEd
               <ButtonGroup>
                 <Button bsStyle="default" onClick={this.save}>Save</Button>
               </ButtonGroup>
+              <ButtonGroup>
+                <Button bsStyle="danger" onClick={this.delete}>Delete</Button>
+              </ButtonGroup>
             </ButtonToolbar>
-            <Well>
-              <textarea className="col-xs-6" value={this.state.post.content} onChange={this.markdownChanged} />
+              <textarea className="col-xs-6" style={{"height": "100vh"}} value={this.state.post.content} onChange={this.markdownChanged} />
               <ReactMarkdown
                 className="result col-xs-6"
                 source={this.state.post.content}
                 skipHtml={true}
                 escapeHtml={true}
               />
-            </Well>
           </div>
         );
     }
diff --git a/src/components/PostListView.tsx b/src/components/PostListView.tsx
index e80c1be..ffbdebf 100644
--- a/src/components/PostListView.tsx
+++ b/src/components/PostListView.tsx
@@ -1,18 +1,87 @@
 import * as React from "react";
 import DbPost from "../model/DbPost";
+import { Tab, Row, Col, NavItem, Nav, Table, Jumbotron, Well, ButtonToolbar, ButtonGroup, Button } from "react-bootstrap";
 import { LinkContainer } from "react-router-bootstrap";
+import IBaseProps from "../domain/IBaseProps";
 
-export interface PostListViewProps{
-  post: DbPost
+export interface PostListViewState {
+  posts: Array<DbPost>;
 }
 
-const PostListView = (props: PostListViewProps) => (
-  <LinkContainer key={`${props.post.title}_link`} to={`/post/${props.post.id}`}>
-    <tr>
-        <td>{props.post.title}</td>
-        <td>{props.post.created_on}</td>
-    </tr>
-  </LinkContainer>
-);
+export default class PostListView extends React.PureComponent<IBaseProps, PostListViewState> {
+  constructor (props: IBaseProps) {
+    super(props);
 
-export default PostListView;
+    this.state = {
+      posts: []
+    };
+
+    this.fetchPosts = this.fetchPosts.bind(this);
+  }
+
+  fetchPosts () {
+    return fetch("/posts",
+    {
+      credentials: 'include'
+    })
+    .then(results => {
+      return results.json();
+    })
+    .then((posts: Array<DbPost>) => {
+        this.setState({
+            posts: posts
+        });
+    });
+  }
+
+  componentDidMount() {
+    this.fetchPosts();
+  }
+
+  render () {
+    return (
+      <div>
+        <ButtonToolbar>
+          <ButtonGroup>
+            <LinkContainer key={"newLink"} to={"/post/new"}>
+              <Button bsStyle="default">New Post</Button>
+            </LinkContainer>
+          </ButtonGroup>
+        </ButtonToolbar>
+        <Table striped bordered condensed hover>
+          <thead>
+              <tr>
+                  <th>Content</th>
+                  <th>Created On</th>
+              </tr>
+          </thead>
+          <tbody>
+            {
+              this.state.posts.map(p => {
+                let content = p.content || "";
+                content = content.trim();
+
+                let firstLineBreak = content.indexOf("\n");
+
+                if (firstLineBreak !== -1) {
+                  content = content.substr(0, firstLineBreak);
+                }
+
+                content = content.replace(/[#]*/g, "");
+
+                return (
+                  <LinkContainer key={`${p.id}_link`} to={`/post/${p.id}`}>
+                    <tr>
+                    <td>{content}</td>
+                    <td>{new Date(p.created_on).toTimeString()}</td>
+                    </tr>
+                  </LinkContainer>
+                );
+              })
+            }
+          </tbody>
+          </Table>
+        </div>
+      );
+  }
+}
diff --git a/src/components/PostView.tsx b/src/components/PostView.tsx
index 0f73f9b..d487da6 100644
--- a/src/components/PostView.tsx
+++ b/src/components/PostView.tsx
@@ -10,7 +10,7 @@ export interface PostViewProps {
 
 const PostView = ( props: PostViewProps ) => (
   <Panel>
-    <h3>{props.post.created_on.toLocaleString()}</h3>
+    <p style={{"text-align": "right"}}>{new Date(props.post.created_on).toTimeString()}</p>
 
     <ReactMarkdown
       key={props.post.id}
diff --git a/src/components/UserListView.tsx b/src/components/UserListView.tsx
index f1a37cd..9609035 100644
--- a/src/components/UserListView.tsx
+++ b/src/components/UserListView.tsx
@@ -1,21 +1,70 @@
 import * as React from "react";
 import DbUser from "../model/DbUser";
 import { LinkContainer } from "react-router-bootstrap";
+import { Tab, Row, Col, NavItem, Nav, Table, Jumbotron, Well } from "react-bootstrap";
+import IBaseProps from "../domain/IBaseProps";
 
-export interface UserListViewProps{
-  user: DbUser
+export interface PostListViewState {
+  users: Array<DbUser>;
 }
 
-const UserListView = (props: UserListViewProps) => (
-  <LinkContainer key={`${props.user.user_name}_link`} to={`/profile/${props.user.id}`}>
-    <tr>
-        <td>{props.user.user_name}</td>
-        <td>{props.user.first_name}</td>
-        <td>{props.user.last_name}</td>
-        <td>{props.user.email}</td>
-        <td>{props.user.is_admin ? "True" : "False"}</td>
-    </tr>
-  </LinkContainer>
-);
+export default class UserListView extends React.PureComponent<IBaseProps, PostListViewState> {
+  constructor (props: IBaseProps) {
+    super(props);
 
-export default UserListView;
+    this.state = {
+      users: []
+    };
+
+    this.fetchUsers = this.fetchUsers.bind(this);
+  }
+
+  fetchUsers(){
+    return fetch("/userList",
+    {
+      credentials: 'include'
+    })
+    .then(results => {
+      return results.json();
+    })
+    .then((users: Array<DbUser>) => {
+        this.setState({
+            users: users
+        });
+    });
+  }
+
+  componentDidMount() {
+    this.fetchUsers();
+  }
+
+  render () {
+    return (
+      <Table striped bordered condensed hover>
+        <thead>
+            <tr>
+                <th>Username</th>
+                <th>First Name</th>
+                <th>Last Name</th>
+                <th>E-Mail</th>
+                <th>Is Admin</th>
+            </tr>
+        </thead>
+        <tbody>
+          {
+            this.state.users.map(user =>
+              <LinkContainer key={`${user.user_name}_link`} to={`/profile/${user.id}`}>
+                <tr>
+                    <td>{user.user_name}</td>
+                    <td>{user.first_name}</td>
+                    <td>{user.last_name}</td>
+                    <td>{user.email}</td>
+                    <td>{user.is_admin ? "True" : "False"}</td>
+                </tr>
+              </LinkContainer>)
+          }
+        </tbody>
+        </Table>
+      );
+  }
+}
diff --git a/src/components/WelcomePage.tsx b/src/components/WelcomePage.tsx
index c916707..e67a406 100644
--- a/src/components/WelcomePage.tsx
+++ b/src/components/WelcomePage.tsx
@@ -34,17 +34,22 @@ export default class WelcomePage extends React.PureComponent<IBaseProps, Welcome
 
   render(){
     return (
-      <Well>
-        <Jumbotron>
-          <h1>Welcome {this.props.user && this.props.user.first_name}</h1>
-          <p>Study certifications, test yourself and take assessments!{this.props.user ? "" : " Sign up or log in to get started"}</p>
-          <br />
-          <br />
-          <br />
-          <h1>News</h1>
-          {this.props.user ? this.state.posts.map(p => <PostView key={p.id} post={p} />) : ""}
-        </Jumbotron>
-      </Well>
+      <div>
+        <div className="col-xs-6">
+          <Well>
+            <Jumbotron>
+              <h1>Welcome {this.props.user && this.props.user.first_name}</h1>
+              <p>Study certifications, test yourself and take assessments!{this.props.user ? "" : " Sign up or log in to get started"}</p>
+            </Jumbotron>
+          </Well>
+        </div>
+        <div className="col-xs-6">
+          <Well>
+            <h1>News</h1>
+            {this.props.user ? this.state.posts.map(p => <PostView key={p.id} post={p} />) : ""}
+          </Well>
+        </div>
+    </div>
     );
   }
 }
diff --git a/src/controllers/CourseController.ts b/src/controllers/CourseController.ts
index bacd160..41f4216 100644
--- a/src/controllers/CourseController.ts
+++ b/src/controllers/CourseController.ts
@@ -43,6 +43,7 @@ let retrieveCourse = (courseName: string) => {
       certification.id = dbCert.id;
       certification.name = dbCert.name;
       certification.uniqueName = dbCert.unique_name;
+      certification.version = dbCert.version;
       certification.isPublished = dbCert.is_published;
 
       return dbCert.id;
@@ -124,9 +125,9 @@ export let postUpload = (req: Request, res: Response) => {
   // Upsert certification first
   let query = [
     "BEGIN;",
-    `INSERT INTO open_certification_trainer.certification (id, name, unique_name, is_published) VALUES ('${data.id}', '${escapeSpecialCharacters(data.name)}', '${escapeSpecialCharacters(data.uniqueName)}', ${data.isPublished || false})
+    `INSERT INTO open_certification_trainer.certification (id, name, unique_name, is_published, version) VALUES ('${data.id}', '${escapeSpecialCharacters(data.name)}', '${escapeSpecialCharacters(data.uniqueName)}', ${data.isPublished || false}, '${escapeSpecialCharacters(data.version)}')
      ON CONFLICT(id) DO
-	     UPDATE SET (name, unique_name, is_published) = ('${escapeSpecialCharacters(data.name)}', '${escapeSpecialCharacters(data.uniqueName)}', ${data.isPublished || false})
+	     UPDATE SET (name, unique_name, is_published, version) = ('${escapeSpecialCharacters(data.name)}', '${escapeSpecialCharacters(data.uniqueName)}', ${data.isPublished || false}, '${escapeSpecialCharacters(data.version)}')
        WHERE open_certification_trainer.certification.id = '${data.id}';`
   ];
 
diff --git a/src/controllers/PostController.ts b/src/controllers/PostController.ts
index f7b4724..419666f 100644
--- a/src/controllers/PostController.ts
+++ b/src/controllers/PostController.ts
@@ -28,18 +28,30 @@ export let getPost = (req: Request, res: Response) => {
   });
 }
 
+export let deletePost = (req: Request, res: Response) => {
+  let postId = req.params.postId;
+
+  pool.query("DELETE from open_certification_trainer.post WHERE id=$1;", [postId])
+  .then(result => {
+    res.json(result.rows);
+  })
+  .catch(err => {
+    res.status(500).send(err.message);
+  });
+}
+
 export let upsertPost = (req: Request, res: Response) => {
   let postId = req.params.postId;
   let post = req.body as DbPost;
 
-  let query = ["INSERT INTO open_certification_trainer.post(id, title, content)",
-               "VALUES ($1, $2, $3)",
+  let query = ["INSERT INTO open_certification_trainer.post(id, content)",
+               "VALUES ($1, $2)",
                "ON CONFLICT(id) DO",
-               "UPDATE SET title=$2, content=$3",
+               "UPDATE SET content=$2",
                "WHERE open_certification_trainer.post.id=$1;"]
               .join("\n");
 
-  let values = [postId, post.title, post.content];
+  let values = [postId, post.content];
 
   pool.query(query, values)
   .then(result => {
diff --git a/src/model/Certification.ts b/src/model/Certification.ts
index 929f545..549b256 100644
--- a/src/model/Certification.ts
+++ b/src/model/Certification.ts
@@ -2,6 +2,7 @@ import Question from "./Question"
 
 export interface CertificationProps {
     name?: string;
+    version?: string;
     uniqueName?: string;
     questions?: Array<Question>;
     isPublished?: boolean;
@@ -10,6 +11,7 @@ export interface CertificationProps {
 
 export default class Certification {
     name?: string;
+    version?: string;
     questions?: Array<Question>;
     uniqueName?: string;
     isPublished?: boolean;
@@ -17,6 +19,7 @@ export default class Certification {
 
     constructor(props: CertificationProps) {
         this.name = props.name || "";
+        this.version = props.version || "";
         this.uniqueName = props.uniqueName || "";
         this.questions = props.questions;
         this.isPublished = props.isPublished || false;
diff --git a/src/model/DbPost.ts b/src/model/DbPost.ts
index 8d82203..f9a0b8d 100644
--- a/src/model/DbPost.ts
+++ b/src/model/DbPost.ts
@@ -1,6 +1,5 @@
 export default class DbPost {
-  created_on: Date;
-  title: string;
+  created_on: string;
   content: string;
   id: string;
 }
diff --git a/src/server.ts b/src/server.ts
index ffbed18..e6d7331 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -99,6 +99,7 @@ app.delete("/assessmentSession/:certificationUniqueName", IsAuthenticated, asses
 app.get("/posts", IsAuthenticated, postController.getPosts);
 app.get("/posts/:postId", IsAuthenticated, postController.getPost);
 app.post("/posts/:postId", IsAdmin, postController.upsertPost);
+app.delete("/posts/:postId", IsAdmin, postController.deletePost);
 
 // Always return the main index.html, so react-router renders the route in the client
 app.get("*", homeController.getAll);