diff --git a/src/main/resources/static/css/techjobs.css b/src/main/resources/static/css/techjobs.css
index caa3eb6..ac08b85 100644
--- a/src/main/resources/static/css/techjobs.css
+++ b/src/main/resources/static/css/techjobs.css
@@ -23,6 +23,10 @@ tr:nth-child(odd) {
     margin-right: auto;
 }
 
+.centeredTable td {
+  padding: 10px 40px;
+}
+
 table.job-listing {
     margin: 30px auto;
     border: 1px solid #e4e4e4;
diff --git a/src/main/resources/templates/employers/view.html b/src/main/resources/templates/employers/view.html
index 563cbf9..3f96ef0 100644
--- a/src/main/resources/templates/employers/view.html
+++ b/src/main/resources/templates/employers/view.html
@@ -7,10 +7,16 @@ <h1 th:text="${'Employer: ' + employer.name}">Default Title</h1>
 
 <nav th:replace="fragments :: page-header"></nav>
 
-<div class="job-listing">
-    <p th:text="${'Name: ' + employer.name}"></p>
-    <p th:text="${'Location: ' + employer.location}"></p>
-</div>
+<table class="job-listing">
+    <tr>
+        <th>Name</th>
+        <td th:text="${employer.name}"></td>
+    </tr>
+    <tr>
+        <th>Location</th>
+        <td th:text="${employer.location}"></td>
+    </tr>
+</table>
 
 
 </body>
diff --git a/src/main/resources/templates/list-jobs.html b/src/main/resources/templates/list-jobs.html
index 609661e..88ee65a 100644
--- a/src/main/resources/templates/list-jobs.html
+++ b/src/main/resources/templates/list-jobs.html
@@ -10,26 +10,27 @@
 
     <h1 th:text="${#strings.capitalizeWords(title)}"></h1>
 
-    <table class="job-listing">
-        <tr th:each="job : ${jobs}">
+    <table class="job-listing" th:each="job : ${jobs}">
+        <tr>
+            <th>ID</th>
             <td>
-                <p>
-                    Job Id:
-                    <a th:href="@{'/view/' + ${job.id}}" th:text="${job.id}"></a>
-                </p>
-                <p th:text="${'Name: ' + job.name}"></p>
-                <p>
-                    Employer:
-                    <a th:href="@{'/employers/view/' + ${job.employer.id}}" th:text="${job.employer.name}"></a>
-                </p>
-                <p>
-                    Skills:
-                    <ul th:each="skill : ${job.skills}">
-                        <li>
-                            <a th:href="@{'/skills/view/' + ${skill.id}}" th:text="${skill.name}"></a>
-                        </li>
-                    </ul>
-                </p>
+                <a th:href="@{'/view/' + ${job.id}}" th:text="${job.id}"></a>
+            </td>
+        </tr>
+        <tr>
+            <th>Name</th>
+            <td th:text="${job.name}"></td>
+        </tr>
+        <tr>
+            <th>Employer</th>
+            <td>
+                <a th:href="@{'/employers/view/' + ${job.employer.id}}" th:text="${job.employer.name}"></a>
+            </td>
+        </tr>
+        <tr>
+            <th>Skills</th>
+            <td>
+                <a th:each="skill : ${job.skills}" th:href="@{'/skills/view/' + ${skill.id}}" th:text="${skill.name + '&nbsp;&nbsp;&nbsp;'}"></a>
             </td>
         </tr>
     </table>