diff --git a/employee/employee.web-js/src/main/webapp/WEB-INF/sun-web.xml b/employee/employee.web-js/src/main/webapp/WEB-INF/sun-web.xml
new file mode 100644
index 0000000..4f17ae7
--- /dev/null
+++ b/employee/employee.web-js/src/main/webapp/WEB-INF/sun-web.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 Servlet 2.5//EN" "http://www.sun.com/software/appserver/dtds/sun-web-app_2_5-0.dtd">
+<sun-web-app error-url="">
+  <context-root>/employee-js</context-root>
+  <class-loader delegate="true"/>
+  <jsp-config>
+    <property name="keepgenerated" value="true">
+      <description>Keep a copy of the generated servlet class java code.</description>
+    </property>
+  </jsp-config>
+</sun-web-app>
diff --git a/employee/employee.web-js/src/main/webapp/css/custom.css b/employee/employee.web-js/src/main/webapp/css/custom.css
new file mode 100755
index 0000000..b93b6b7
--- /dev/null
+++ b/employee/employee.web-js/src/main/webapp/css/custom.css
@@ -0,0 +1,128 @@
+/* ==========================================================================
+ 	TODO
+   ========================================================================== */
+
+/* ==========================================================================
+ 	Table styles from - http://pythoughts.com/table-style-css/
+   ========================================================================== */
+.table-design {
+	border: 1px solid #e3e3e3;
+	background-color: #f2f2f2;
+	width: 100%;
+	border-radius: 6px;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+}
+
+.table-design td,.table-design th {
+	padding: 5px;
+	color: #333;
+}
+
+.table-design thead {
+	font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
+	padding: .2em 0 .2em .5em;
+	text-align: left;
+	color: #4B4B4B;
+	background-color: #C8C8C8;
+	background-image: -webkit-gradient(linear, left top, left bottom, from(#f2f2f2),
+		to(#e3e3e3), color-stop(.6, #B3B3B3) );
+	background-image: -moz-linear-gradient(top, #D6D6D6, #B0B0B0, #B3B3B3 90%);
+	border-bottom: solid 1px #999;
+}
+
+.table-design th {
+	font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+	font-size: 17px;
+	line-height: 20px;
+	font-style: normal;
+	font-weight: normal;
+	text-align: left;
+	text-shadow: white 1px 1px 1px;
+}
+
+.table-design td {
+	line-height: 20px;
+	font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+	font-size: 14px;
+	border-bottom: 1px solid #fff;
+	border-top: 1px solid #fff;
+}
+
+.main-menu {
+	border: 2px solid;
+	border-radius: 25px;
+	-moz-border-radius: 25px; /* Old Firefox */
+}
+
+.menu-button {
+	border-top: 1px solid #96d1f8;
+	background: #65a9d7;
+	background: -webkit-gradient(linear, left top, left bottom, from(#003366),
+		to(#65a9d7) );
+	background: -webkit-linear-gradient(top, #003366, #65a9d7);
+	background: -moz-linear-gradient(top, #003366, #65a9d7);
+	background: -ms-linear-gradient(top, #003366, #65a9d7);
+	background: -o-linear-gradient(top, #003366, #65a9d7);
+	padding: 10.5px 21px;
+	-webkit-border-radius: 18px;
+	-moz-border-radius: 18px;
+	border-radius: 18px;
+	-webkit-box-shadow: rgba(0, 0, 0, 1) 0 1px 0;
+	-moz-box-shadow: rgba(0, 0, 0, 1) 0 1px 0;
+	box-shadow: rgba(0, 0, 0, 1) 0 1px 0;
+	text-shadow: rgba(0, 0, 0, .4) 0 1px 0;
+	color: white;
+	font-size: 19px;
+	font-family: Helvetica, Arial, Sans-Serif;
+	text-decoration: none;
+	vertical-align: middle;
+	width: 200px;
+	padding: 5px 5px 5px 5px;
+}
+
+.menu-button:hover {
+	border-top-color: #330066;
+	background: #330066;
+	color: #ccc;
+}
+
+.menu-button:active {
+	border-top-color: #ff0000;
+	background: #ff0000;
+}
+
+.button-small {
+	border-top: 1px solid #96d1f8;
+	background: #65a9d7;
+	background: -webkit-gradient(linear, left top, left bottom, from(#003366),
+		to(#65a9d7) );
+	background: -webkit-linear-gradient(top, #003366, #65a9d7);
+	background: -moz-linear-gradient(top, #003366, #65a9d7);
+	background: -ms-linear-gradient(top, #003366, #65a9d7);
+	background: -o-linear-gradient(top, #003366, #65a9d7);
+	padding: 4px 8px;
+	-webkit-border-radius: 18px;
+	-moz-border-radius: 18px;
+	border-radius: 18px;
+	-webkit-box-shadow: rgba(0, 0, 0, 1) 0 1px 0;
+	-moz-box-shadow: rgba(0, 0, 0, 1) 0 1px 0;
+	box-shadow: rgba(0, 0, 0, 1) 0 1px 0;
+	text-shadow: rgba(0, 0, 0, .4) 0 1px 0;
+	color: white;
+	font-size: 17px;
+	font-family: Helvetica, Arial, Sans-Serif;
+	text-decoration: none;
+	vertical-align: middle;
+}
+
+.button-small:hover {
+	border-top-color: #330066;
+	background: #330066;
+	color: #ccc;
+}
+
+.button-small:active {
+	border-top-color: #ff0000;
+	background: #ff0000;
+}
\ No newline at end of file
diff --git a/employee/employee.web-js/src/main/webapp/css/local.css b/employee/employee.web-js/src/main/webapp/css/local.css
index 76339c6..9bedcb4 100644
--- a/employee/employee.web-js/src/main/webapp/css/local.css
+++ b/employee/employee.web-js/src/main/webapp/css/local.css
@@ -1,36 +1,3 @@
-#employee-list {
-	width: 500px;
-}
-
-#employe-list-head td, #employee-list-body td {
-	border: 1px solid;
-}
-
-#employee-list-foot tr {
-	border: 1px solid;
-}
-
-#employee-list-foot td {
-	border: 0;
-}
-
 .employee-action {
 	text-align: center;
 }
-
-#employees-pagination tr {
-	border: 0;
-}
-
-#employees-previous {
-	float: left;
-}
-
-#employees-pages {
-	float: center;
-}
-
-#employees-next {
-	float: right;
-}
-
diff --git a/employee/employee.web-js/src/main/webapp/css/main.css b/employee/employee.web-js/src/main/webapp/css/main.css
index 663b4a7..f1366fd 100755
--- a/employee/employee.web-js/src/main/webapp/css/main.css
+++ b/employee/employee.web-js/src/main/webapp/css/main.css
@@ -1,145 +1,141 @@
-#employee-list {
-	width: 500
-}
-
 /* ==========================================================================
    HTML5 Boilerplate styles - h5bp.com (generated via initializr.com)
    ========================================================================== */
-
-html,
-button,
-input,
-select,
-textarea {
-    color: #222;
-}
-
-body {
-    font-size: 1em;
-    line-height: 1.4;
+html,body {
+	font-size: 1em;
+	line-height: 1.4;
+	font: 16px/26px Helvetica, Helvetica Neue, Arial;
+	margin: 0;
+	padding: 0;
+	height: 100%;
 }
 
 ::-moz-selection {
-    background: #b3d4fc;
-    text-shadow: none;
+	background: #b3d4fc;
+	text-shadow: none;
 }
 
 ::selection {
-    background: #b3d4fc;
-    text-shadow: none;
+	background: #b3d4fc;
+	text-shadow: none;
 }
 
 hr {
-    display: block;
-    height: 1px;
-    border: 0;
-    border-top: 1px solid #ccc;
-    margin: 1em 0;
-    padding: 0;
+	display: block;
+	height: 1px;
+	border: 0;
+	border-top: 1px solid #ccc;
+	margin: 1em 0;
+	padding: 0;
 }
 
 img {
-    vertical-align: middle;
+	vertical-align: middle;
 }
 
 fieldset {
-    border: 0;
-    margin: 0;
-    padding: 0;
+	border: 0;
+	margin: 0;
+	padding: 0;
 }
 
 textarea {
-    resize: vertical;
+	resize: vertical;
 }
 
 .chromeframe {
-    margin: 0.2em 0;
-    background: #ccc;
-    color: #000;
-    padding: 0.2em 0;
+	margin: 0.2em 0;
+	background: #ccc;
+	color: #000;
+	padding: 0.2em 0;
 }
 
-
 /* ===== Initializr Styles ==================================================
    Author: Jonathan Verrecchia - verekia.com/initializr/responsive-template
    ========================================================================== */
-
-body {
-    font: 16px/26px Helvetica, Helvetica Neue, Arial;
-}
-
 .wrapper {
-    width: 90%;
-    margin: 0 5%;
+	width: 90%;
+	margin: 0 5%;
 }
 
 /* ===================
-    ALL: Orange Theme
+    ALL: EclipseLink Theme
    =================== */
-
-.header-container {
-    border-bottom: 20px solid #003366;
+#body-container {
+	min-height: 100%;
+	position: relative;
 }
 
-.footer-container,
-.main aside div {
-    border-top: 20px;
+#header-container {
+	border-bottom: 20px solid #003366;
+	padding: : 10px;
+	background: #330066;
 }
 
-.header-container,
-.footer-container {
-    background: #330066;
+#footer-container,.main aside div {
+	border-top: 20px;
+}
+
+#main-container {
+	padding: 10px;
+	padding-bottom: 10em; /* Height of the footer */
+}
+
+#footer-container {
+	position: absolute;
+	bottom: 0;
+	width: 100%;
+	height: 10em; /* Height of the footer */
+	background: #330066;
+}
+
+#footer-container footer {
+	color: white;
+	padding: 20px 0 0 20px;
+	position: fixed;
 }
 
 .title {
-    color: white;
+	color: white;
 }
 
 /* ==============
     MOBILE: Menu
    ============== */
-
 nav ul {
-    margin: 0;
-    padding: 0;
+	margin: 0;
+	padding: 0;
 }
 
 nav a {
-    display: block;
-    margin-bottom: 10px;
-    padding: 15px 0;
-
-    text-align: center;
-    text-decoration: none;
-    font-weight: bold;
-
-    color: white;
-    background: #003366;
+	display: block;
+	margin-bottom: 10px;
+	padding: 15px 0;
+	text-align: center;
+	text-decoration: none;
+	font-weight: bold;
+	color: white;
+	background: #003366;
 }
 
-nav a:hover,
-nav a:visited {
-    color: white;
+nav a:hover,nav a:visited {
+	color: white;
 }
 
 nav a:hover {
-    text-decoration: underline;
+	text-decoration: underline;
 }
 
-/* ==============
-    MOBILE: Main
-   ============== */
-
 .main {
-    padding: 30px 0;
+	padding: 30px 0;
 }
 
 .main article h1 {
-    font-size: 2em;
+	font-size: 2em;
 }
 
 .main aside {
-    padding: 10px 10px 10px 10px;
+	padding: 10px 10px 10px 10px;
 }
 
 .main aside img {
@@ -152,258 +148,141 @@
 	margin: 0;
 }
 
-.footer-container footer {
-    color: white;
-    padding: 20px 0;
-}
-
 /* ===============
     ALL: IE Fixes
    =============== */
-
 .ie7 .title {
-    padding-top: 20px;
+	padding-top: 20px;
 }
 
 /* ==========================================================================
-   Author's custom styles
-   ========================================================================== */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-/* ==========================================================================
    Media Queries
    ========================================================================== */
-
-@media only screen and (min-width: 480px) {
-
-/* ====================
+@media only screen and (min-width: 480px) { /* ====================
     INTERMEDIATE: Menu
    ==================== */
+	nav a {
+		float: left;
+		width: 27%;
+		margin: 0 1.7%;
+		padding: 25px 2%;
+		margin-bottom: 0;
+	}
+	nav li:first-child a {
+		margin-left: 0;
+	}
+	nav li:last-child a {
+		margin-right: 0;
+	}
 
-    nav a {
-        float: left;
-        width: 27%;
-        margin: 0 1.7%;
-        padding: 25px 2%;
-        margin-bottom: 0;
-    }
-
-    nav li:first-child a {
-        margin-left: 0;
-    }
-
-    nav li:last-child a {
-        margin-right: 0;
-    }
-
-/* ========================
+	/* ========================
     INTERMEDIATE: IE Fixes
    ======================== */
-
-    nav ul li {
-        display: inline;
-    }
-
-    .oldie nav a {
-        margin: 0 0.7%;
-    }
+	nav ul li {
+		display: inline;
+	}
+	.oldie nav a {
+		margin: 0 0.7%;
+	}
 }
 
-@media only screen and (min-width: 768px) {
-
-/* ====================
+@media only screen and (min-width: 768px) { /* ====================
     WIDE: CSS3 Effects
    ==================== */
+	.header-container,.main aside {
+		-webkit-box-shadow: 2px 5px 10px #aaa;
+		-moz-box-shadow: 2px 5px 10px #aaa;
+		box-shadow: 2px 5px 10px #aaa;
+	}
 
-    .header-container,
-    .main aside {
-        -webkit-box-shadow: 2px 5px 10px #aaa;
-           -moz-box-shadow: 2px 5px 10px #aaa;
-                box-shadow: 2px 5px 10px #aaa;
-    }
-
-/* ============
+	/* ============
     WIDE: Menu
    ============ */
+	.title {
+		float: left;
+	}
+	nav {
+		float: right;
+		width: 38%;
+	}
 
-    .title {
-        float: left;
-    }
-
-    nav {
-        float: right;
-        width: 38%;
-    }
-
-/* ============
+	/* ============
     WIDE: Main
    ============ */
-
-    .main article {
-        float: left;
-        width: 57%;
-    }
-
-    .main aside {
-        float: right;
-        width: 28%;
-    }
+	.main article {
+		float: left;
+		width: 57%;
+	}
+	.main aside {
+		float: right;
+		width: 28%;
+	}
 }
 
-@media only screen and (min-width: 1140px) {
-
-/* ===============
+@media only screen and (min-width: 1140px) { /* ===============
     Maximal Width
    =============== */
-
-    .wrapper {
-        width: 1026px; /* 1140px - 10% for margins */
-        margin: 0 auto;
-    }
+	.wrapper {
+		width: 1026px; /* 1140px - 10% for margins */
+		margin: 0 auto;
+	}
 }
 
 /* ==========================================================================
    Helper classes
    ========================================================================== */
-
 .ir {
-    background-color: transparent;
-    border: 0;
-    overflow: hidden;
-    *text-indent: -9999px;
+	background-color: transparent;
+	border: 0;
+	overflow: hidden;
+	*text-indent: -9999px;
 }
 
 .ir:before {
-    content: "";
-    display: block;
-    width: 0;
-    height: 150%;
+	content: "";
+	display: block;
+	width: 0;
+	height: 150%;
 }
 
 .hidden {
-    display: none !important;
-    visibility: hidden;
+	display: none !important;
+	visibility: hidden;
 }
 
 .visuallyhidden {
-    border: 0;
-    clip: rect(0 0 0 0);
-    height: 1px;
-    margin: -1px;
-    overflow: hidden;
-    padding: 0;
-    position: absolute;
-    width: 1px;
+	border: 0;
+	clip: rect(0, 0, 0, 0);
+	height: 1px;
+	margin: -1px;
+	overflow: hidden;
+	padding: 0;
+	position: absolute;
+	width: 1px;
 }
 
-.visuallyhidden.focusable:active,
-.visuallyhidden.focusable:focus {
-    clip: auto;
-    height: auto;
-    margin: 0;
-    overflow: visible;
-    position: static;
-    width: auto;
+.visuallyhidden.focusable:active,.visuallyhidden.focusable:focus {
+	clip: auto;
+	height: auto;
+	margin: 0;
+	overflow: visible;
+	position: static;
+	width: auto;
 }
 
 .invisible {
-    visibility: hidden;
+	visibility: hidden;
 }
 
-.clearfix:before,
-.clearfix:after {
-    content: " ";
-    display: table;
+.clearfix:before,.clearfix:after {
+	content: " ";
+	display: table;
 }
 
 .clearfix:after {
-    clear: both;
+	clear: both;
 }
 
 .clearfix {
-    *zoom: 1;
-}
-
-/* ==========================================================================
-   Print styles
-   ========================================================================== */
-
-@media print {
-    * {
-        background: transparent !important;
-        color: #000 !important; /* Black prints faster: h5bp.com/s */
-        box-shadow: none !important;
-        text-shadow: none !important;
-    }
-
-    a,
-    a:visited {
-        text-decoration: underline;
-    }
-
-    a[href]:after {
-        content: " (" attr(href) ")";
-    }
-
-    abbr[title]:after {
-        content: " (" attr(title) ")";
-    }
-
-    /*
-     * Don't show links for images, or javascript/internal links
-     */
-
-    .ir a:after,
-    a[href^="javascript:"]:after,
-    a[href^="#"]:after {
-        content: "";
-    }
-
-    pre,
-    blockquote {
-        border: 1px solid #999;
-        page-break-inside: avoid;
-    }
-
-    thead {
-        display: table-header-group; /* h5bp.com/t */
-    }
-
-    tr,
-    img {
-        page-break-inside: avoid;
-    }
-
-    img {
-        max-width: 100% !important;
-    }
-
-    @page {
-        margin: 0.5cm;
-    }
-
-    p,
-    h2,
-    h3 {
-        orphans: 3;
-        widows: 3;
-    }
-
-    h2,
-    h3 {
-        page-break-after: avoid;
-    }
+	*zoom: 1;
 }
\ No newline at end of file
diff --git a/employee/employee.web-js/src/main/webapp/employee/search-results.html b/employee/employee.web-js/src/main/webapp/employee/search-results.html
index c9f5ad6..0f96f60 100644
--- a/employee/employee.web-js/src/main/webapp/employee/search-results.html
+++ b/employee/employee.web-js/src/main/webapp/employee/search-results.html
@@ -14,21 +14,20 @@
  -->
 <div>
 	<div>
-		<h1>Employees</h1>
-		<table id='employee-list'>
-			<thead id='employee-list-head'>
+		<h1>Employee Search Results</h1>
+		<table class='table-design'>
+			<thead>
 				<tr>
 					<td colspan='5'>Filter: <input ng-model='query'></td>
 				</tr>
-			</thead>
-			<tbody id='employee-list-body'>
 				<tr>
 					<td>ID</td>
 					<td>Last Name</td>
 					<td>First Name</td>
-					<td></td>
-					<td></td>
+					<td colspan='2'></td>
 				</tr>
+			</thead>
+			<tbody>
 				<tr ng-repeat='employee in employees | filter:query'>
 					<td>{{employee.id}}</td>
 					<td>{{employee.lastName}}</td>
@@ -38,20 +37,20 @@
 					<td class='employee-action'>Delete</td>
 				</tr>
 			</tbody>
-			<tfoot id='employee-list-foot'>
+			<tfoot>
 				<tr>
 					<td colspan='5'>
-						<table id='employees-pagination' width='100%'>
+						<table width='100%'>
 							<tr>
 								<td>
-									<button type='button' id='employees-previous'
-										ng-click='pagePrevious()'>Previous Page</button>
+									<button ng-show='prevAvailable' class='button-small' type='button'
+										ng-click='pagePrevious()'>Previous</button>
 								</td>
-								<td colspan='3'><span id='employees-pages'>Page {{pageNum}} of
+								<td align='center' width='100%' colspan='3'><span id='employees-pages'>Page {{pageNum}} of
 										{{totalPages}}</span></td>
 								<td>
-									<button type='button' id='employees-next' ng-click='pageNext()'>Next
-										Page</button>
+									<button ng-show='nextAvailable' class='button-small' type='button' 
+										ng-click='pageNext()'>Next</button>
 								</td>
 							</tr>
 						</table>
diff --git a/employee/employee.web-js/src/main/webapp/index.html b/employee/employee.web-js/src/main/webapp/index.html
index eb631f9..85e8446 100755
--- a/employee/employee.web-js/src/main/webapp/index.html
+++ b/employee/employee.web-js/src/main/webapp/index.html
@@ -15,53 +15,55 @@
 <style type='text/css' media='all'>
 @import url('css/main.css');
 @import url('css/normalize.css');
+@import url('css/custom.css');
 @import url('css/local.css');
 </style>
 </head>
 <body>
-	<div class='header-container'>
-		<header class='wrapper clearfix'>
-			<h1 class='title'>EclipseLink Employee Example</h1>
-			<nav>
-				<form>
-					<ul>
-						<li><a href='#/home'>Home</a></li>
-						<li><a href='#/about'>About</a></li>
-						<li><a href='#/admin'>Admin</a></li>
-					</ul>
-				</form>
-			</nav>
-		</header>
-	</div>
-
-	<div class='main-container'>
-		<div class='main wrapper clearfix'>
-
-			<article>
-				<header>
-					<div ng-view></div>
-				</header>
-			</article>
-
-			<aside>
-				<img src='resources/images/eclipselink-logo.png' alt='EclipseLink'
-					title='EclipseLink Employee Example' />
-				<div class='commentary'>
-					<h3>Inside EclipseLink</h3>
-					<p>Over here we'll give some insight into what features of
-						EclipseLink are in use and provide diagnostic and informational
-						links.</p>
-				</div>
-			</aside>
-
+	<div id="body-container">
+		<div id='header-container'>
+			<header class='wrapper clearfix'>
+				<h1 class='title'>EclipseLink Employee Example</h1>
+				<nav>
+					<form>
+						<ul>
+							<li><a href='#/home'>Home</a></li>
+							<li><a href='#/about'>About</a></li>
+							<li><a href='#/admin'>Admin</a></li>
+						</ul>
+					</form>
+				</nav>
+			</header>
 		</div>
-		<!-- #main -->
-	</div>
-	<!-- #main-container -->
 
-	<div class='footer-container'>
-		<footer class='wrapper'></footer>
-	</div>
+		<div id='main-container'>
+			<div class='main wrapper clearfix'>
 
+				<article>
+					<header>
+						<div ng-view></div>
+					</header>
+				</article>
+
+				<aside>
+					<img src='resources/images/eclipselink-logo.png' alt='EclipseLink'
+						title='EclipseLink Employee Example' />
+					<div class='commentary'>
+						<h3>Inside EclipseLink</h3>
+						<p>Over here we'll give some insight into what features of
+							EclipseLink are in use and provide diagnostic and informational
+							links.</p>
+					</div>
+				</aside>
+
+			</div>
+			<!-- #main -->
+		</div>
+		<!-- #main-container -->
+
+		<div id='footer-container'>
+			<footer class='wrapper'></footer>
+		</div>
+	</div>
 </body>
 </html>
diff --git a/employee/employee.web-js/src/main/webapp/js/controllers.js b/employee/employee.web-js/src/main/webapp/js/controllers.js
index bf932f7..144cdd4 100755
--- a/employee/employee.web-js/src/main/webapp/js/controllers.js
+++ b/employee/employee.web-js/src/main/webapp/js/controllers.js
@@ -21,20 +21,24 @@
 	$scope.pageSize = 10;
 	$scope.first = 0;
 	$scope.max = $scope.pageSize;
+
 	Employees.count().then(function (response) {
 		$scope.count = response.data.COUNT;
 		$scope.totalPages = Math.floor($scope.count / $scope.pageSize) + ($scope.count % $scope.pageSize > 0 ? 1 : 0);
+		fetchPage();
 	});
 	
 	function fetchPage() {
 		$scope.employees = Employees.getPage({}, {
 			first : $scope.first,
 			max : $scope.max
-		});	
+		});
+		$scope.nextAvailable = $scope.count > $scope.max;
+		$scope.prevAvailable = $scope.first - $scope.pageSize >= 0;
 	}
 	
 	$scope.pageNext = function () {
-		if ($scope.count > $scope.max)  {
+		if ($scope.nextAvailable)  {
 			$scope.first = $scope.max;
 			$scope.max = $scope.max + $scope.pageSize;
 			$scope.pageNum++;
@@ -43,7 +47,7 @@
 	};
 	
 	$scope.pagePrevious = function() {
-		if ($scope.first - $scope.pageSize >= 0) {
+		if ($scope.prevAvailable) {
 			$scope.max = $scope.first;
 			$scope.first = $scope.first - $scope.pageSize;
 			$scope.pageNum--;
@@ -51,7 +55,6 @@
 		}
 	};
 	
-	fetchPage();
 }
 
 function EmployeeEditCtrl($scope, $routeParams, $location, Employee) {
diff --git a/employee/employee.web/src/main/webapp/WEB-INF/sun-web.xml b/employee/employee.web/src/main/webapp/WEB-INF/sun-web.xml
new file mode 100644
index 0000000..17d7ce3
--- /dev/null
+++ b/employee/employee.web/src/main/webapp/WEB-INF/sun-web.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 Servlet 2.5//EN" "http://www.sun.com/software/appserver/dtds/sun-web-app_2_5-0.dtd">
+<sun-web-app error-url="">
+  <context-root>/employee</context-root>
+  <class-loader delegate="true"/>
+  <jsp-config>
+    <property name="keepgenerated" value="true">
+      <description>Keep a copy of the generated servlet class java code.</description>
+    </property>
+  </jsp-config>
+</sun-web-app>
diff --git a/employee/employee.web/src/main/webapp/employee/results.xhtml b/employee/employee.web/src/main/webapp/employee/results.xhtml
index 8e97564..94cef41 100644
--- a/employee/employee.web/src/main/webapp/employee/results.xhtml
+++ b/employee/employee.web/src/main/webapp/employee/results.xhtml
@@ -12,7 +12,7 @@
 		<h1>Employee Search Results</h1>
 		<h:form>
 			<h:dataTable var="emp" value="#{employeeResults.employees}"
-				border="1" width="500" class="table-design">
+				class="table-design">
 				<h:column>
 					<f:facet name="header">ID</f:facet>
 					<h:outputText value="#{emp.id}" />