diff --git a/src/components/ItemBodyView/ItemBodyView.js b/src/components/ItemBodyView/ItemBodyView.js
index eda0813..08a57f9 100644
--- a/src/components/ItemBodyView/ItemBodyView.js
+++ b/src/components/ItemBodyView/ItemBodyView.js
@@ -1,6 +1,6 @@
 import React from "react";
 import PropTypes from "prop-types";
-import { Timeline, TimelineItem, TimelineSeparator, TimelineConnector, TimelineContent, TimelineDot, Skeleton } from '@material-ui/lab';
+import { Timeline, TimelineItem, TimelineSeparator, TimelineConnector, TimelineContent, TimelineDot } from '@material-ui/lab';
 import { makeStyles } from "@material-ui/core";
 import DirectoryInformation from "../DirectoryInformation/";
 import Assignment from "../Assignment/";
@@ -41,11 +41,11 @@ export default function ItemBodyView({ item }) {
 			case "status":
 				return <TimelineActionCard {...section} />
 			case "assignment":
-				return <Assignment {...section} />
+					return <Assignment {...section} />
 			case "reply_to_user":
 				return <TimelineActionCard {...section} />
 			case "reply_from_user":
-				return <MessageView {...section} />
+				return  <MessageView {...section} />
 			case "parse_error":
 				return <ParseError {...section} />
 			default:
@@ -53,14 +53,9 @@ export default function ItemBodyView({ item }) {
 		};
 	};
 
-	const testing = true;
-
 	return (
 		<Timeline align="left" classes={{ root: classes["Timeline-root"] }}>
-			{/* Below is the original ternary operation for the map fucntion for future reference */}
-			{/* {objectIsEmpty(item) ? "" : item.content.map((section) */}
-
-			{testing ? Object.keys(item).map((section) => (
+			{objectIsEmpty(item) ? "" : item.content.map((section) => (
 				<TimelineItem
 					classes={{
 						missingOppositeContent: classes["TimelineItem-missingOppositeContent"],
@@ -73,29 +68,10 @@ export default function ItemBodyView({ item }) {
 					<TimelineContent
 						classes={{ root: classes["TimelineContent-root"] }}
 					>
-						<Skeleton />
+						{generateTimelineItem(section)}
 					</TimelineContent>
 				</TimelineItem>
-			))
-				: item.content.map((section) => (
-					<TimelineItem
-						classes={{
-							missingOppositeContent: classes["TimelineItem-missingOppositeContent"],
-						}}
-					>
-						<TimelineSeparator>
-							<TimelineDot />
-							<TimelineConnector />
-						</TimelineSeparator>
-						<TimelineContent
-							classes={{ root: classes["TimelineContent-root"] }}
-						>{item === undefined
-							? <Skeleton />
-							: generateTimelineItem(section)
-							}
-						</TimelineContent>
-					</TimelineItem>
-				))}
+			))}
 		</Timeline>
 	);
 };