diff --git a/WebContent/html/css/stylesheet.css b/WebContent/html/css/stylesheet.css
index f063542..bbe9f43 100644
--- a/WebContent/html/css/stylesheet.css
+++ b/WebContent/html/css/stylesheet.css
@@ -59,7 +59,7 @@ div.modal-content{
     padding: 10px;
     border: 1px solid #888;
     width: 80%;
-    max-height: 80%; 
+    max-height: 100%; 
     text-align: center;
     vertical-align: center;
     align-items: center;
diff --git a/WebContent/html/javascript/request.jsp b/WebContent/html/javascript/request.jsp
index 68ffb65..5414824 100644
--- a/WebContent/html/javascript/request.jsp
+++ b/WebContent/html/javascript/request.jsp
@@ -21,35 +21,6 @@ var devices = makeDeviceArray();
 //get all the option buttons
 var hardwareOptions = document.getElementsByClassName('hw-data-type');
 var softwareOptions = document.getElementsByClassName('sw-data-type');
-function ajaxFunction(){
-	var request;
-	try {
-	request = new XMLHttpRequest();
-	}
-	catch(e){
-	try {
-	request = new ActiveXObject("Msxml2.XMLHTTP");
-	}
-	catch(e){
-		try {
-		request = new ActiveXObject(Microsoft.XMLHTTP);
-		} catch(e) {
-				alert("Something is wrong with your browser");
-				return false;
-		}
-	
-			}
-		}
-	
-	
-	request.onreadystatechange = function(){
-		if(request.readyState == 4){
-			var display = document.getElementById('ajaxDiv');
-			display.innerHTML = request.responseText;
-		}
-	}
-	
-}
 //add event listeners to the options in the left sidebar
 for(var a = 0; a < hardwareOptions.length; a++){
 	hardwareOptions[a].addEventListener('click', refresh);
diff --git a/WebContent/html/webpages/navbar.html b/WebContent/html/webpages/navbar.html
index 578a279..3f7f865 100644
--- a/WebContent/html/webpages/navbar.html
+++ b/WebContent/html/webpages/navbar.html
@@ -1,3 +1,5 @@
+<%@ page import = "database.*,entities.User" %>
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
 <div class="container-fluid">
 	<div class="navbar-header">
 		<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
@@ -7,7 +9,9 @@
 			<span class="icon-bar"></span>
 		</button>
 		<a class="navbar-brand" href="../webpages/admin.jsp">
-			<img src="../imgs/synchrony-financial-logo-dlpx_1.png" style = "height: 100%;">
+			<img src="../imgs/synchrony-financial-logo-dlpx_1.png" style = "height: 100%; display: inline-block;">
+			&nbsp;&nbsp;&nbsp;&nbsp;
+			<p style = "display: inline-block" id = "user"></p>
 		</a>
 	</div>
 	<div id="navbar" class="navbar-collapse collapse" aria-expanded="false">
@@ -19,4 +23,20 @@
 			<li><a href="shoppingCart.jsp">Shopping Cart</a></li>
 		</ul>
 	</div>
+	<%
+	Cookie[] cookies = request.getCookies();
+	int sso = 0;
+	for(Cookie c : cookies){
+		if(c.getName().equals("ssoNum")){
+			sso = Integer.ParseInt(c.getValue());
+			break;
+		}
+	}
+	User self = EmployeeQueries.getEmployeeID(sso);
+	String name = self.getName();
+	%>
 </div>
+<script>
+var name = '<%=name%>';
+$('#user').val("Hello " + name + "!");
+</script>
diff --git a/WebContent/html/webpages/navbar.jsp b/WebContent/html/webpages/navbar.jsp
new file mode 100644
index 0000000..b609f53
--- /dev/null
+++ b/WebContent/html/webpages/navbar.jsp
@@ -0,0 +1,42 @@
+<%@ page import = "database.*,entities.User" %>
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
+<div class="container-fluid">
+	<div class="navbar-header">
+		<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+			<span class="sr-only">Toggle navigation</span>
+			<span class="icon-bar"></span>
+			<span class="icon-bar"></span>
+			<span class="icon-bar"></span>
+		</button>
+		<a class="navbar-brand" href="../webpages/admin.jsp">
+			<img src="../imgs/synchrony-financial-logo-dlpx_1.png" style = "height: 100%; display: inline-block;">
+			&nbsp;&nbsp;&nbsp;&nbsp;
+			<p style = "display: inline-block" id = "user"></p>
+		</a>
+	</div>
+	<div id="navbar" class="navbar-collapse collapse" aria-expanded="false">
+		<ul class="nav navbar-nav navbar-right">
+			<li><a href="../webpages/">Home</a></li>
+			<li><a href="requestPage.jsp">Request Device</a></li>
+			<li><a href="returnPage.jsp">Return Device</a></li>
+			<li><a href="listingPage.jsp">Device Listing</a></li>
+			<li><a href="shoppingCart.jsp">Shopping Cart</a></li>
+		</ul>
+	</div>
+	<%
+	Cookie[] usercookies = request.getCookies();
+	int navsso = 0;
+	for(Cookie c : usercookies){
+		if(c.getName().equals("ssoNum")){
+			navsso = Integer.parseInt(c.getValue());
+			break;
+		}
+	}
+	User self = EmployeeQueries.getEmployeeByID(navsso);
+	String name = self.getName();
+	%>
+</div>
+<script>
+var name = '<%=name%>';
+document.getElementById('user').innerHTML = "Hi " + name + "!";
+</script>
\ No newline at end of file
diff --git a/WebContent/html/webpages/returnComplete.jsp b/WebContent/html/webpages/returnComplete.jsp
index 4ed52d5..7abb079 100644
--- a/WebContent/html/webpages/returnComplete.jsp
+++ b/WebContent/html/webpages/returnComplete.jsp
@@ -26,12 +26,13 @@
 <body>
   <h2>Returning Devices</h2>
   <p>Thanks for returning some devices!</p>
-
+  <form action = "returnPage.jsp">
+  	<button type = "submit" class = "btn btn-primary">Go Back</button>
+  </form>
 <%
 //get string from request form
 String devices = request.getParameter("devicesToReturn");
 DeviceQueries.returnDevices(devices);
 %>
-<!-- Navbar generation. -->
 </body>
 </html>
\ No newline at end of file
diff --git a/WebContent/html/webpages/returnPage.jsp b/WebContent/html/webpages/returnPage.jsp
index 15bdf43..aa61042 100644
--- a/WebContent/html/webpages/returnPage.jsp
+++ b/WebContent/html/webpages/returnPage.jsp
@@ -1,4 +1,4 @@
-<%@ page import = "database.*,entities.RentedDevice" %>
+<%@ page import = "database.*,entities.Device" %>
 <%@ page language="java" contentType="text/html; charset=ISO-8859-1"
     pageEncoding="ISO-8859-1"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
@@ -75,7 +75,7 @@
     }
   </style>
   <nav class="navbar navbar-inverse navbar-fixed-top" id = "navbaruniversal">
-    <%@ include file="navbar.html"%>
+    <%@ include file="navbar.jsp"%>
   </nav>
 </head>
 <body>
@@ -98,10 +98,10 @@
               	</thread>
               	<tbody id = "tablebody">
               	</tbody>
-              </table><br>
+              </table>
               <form ACTION = "returnComplete.jsp" METHOD = "POST">
                 <input type = "text" id = "deviceArray" style = "display: none;" name = "devicesToReturn"></input>
-                <input type = "submit" value = "Submit">
+                <button type = "submit" class = "btn btn-primary">Submit</button>
               </form>
             </div>
         </div>
@@ -109,12 +109,9 @@
    <!-- Sidebar. -->
    <div class="col-sm-3 col-md-2 sidebar">
     <ul class="nav nav-sidebar">
-      <h4>Filter by Time Ordered</h4>
-      <li class = "option" id = "all"><a href="#">All devices</a></li>
-      <li class = "option" id = "1month"><a href="#">Past month</a></li>
-      <li class = "option" id = "1-3months"><a href="#">1-3 months ago</a></li>
-      <li class = "option" id = "3-5months"><a href="#">3-5 months ago</a></li>
-      <li class = "option" id = "5+months"n><a href="#">5+ months ago</a></li>
+      <h4>Return Page Options</h4>
+      <li class = "option" id = "returnbutton"><a href="#">Return Selected</a></li>
+      <li class = "option" id = "returnall"><a href="#">Return All</a></li>
     </ul>
   </div>
   <div class="displayDevice">
@@ -122,15 +119,22 @@
     <!-- Device information boxes placed here. -->
     <div id = "devContainer">
     </div>
-    <button id ="returnbutton">Return</button>
   </div>
 
 <%
-//String userID = cookie implementation exists here.
-//19 is just for testing purposes. Replaced by userID later.
-RentedDevice[] mydevices = DeviceQueries.getUserDevices("19");
+//get user information
+Cookie[] cookies = request.getCookies();
+String sso = "";
+for(Cookie c : cookies){
+	if(c.getName().equals("ssoNum")){
+		sso = c.getValue();
+		break;
+	}
+}
+
+Device[] mydevices = DeviceQueries.getUserDevices(sso);
 //string representation of array.
-String deviceString = RentedDevice.arrayToString(mydevices);
+String deviceString = Device.arrayToString(mydevices);
 %>
 
 <script type=text/javascript>
@@ -146,8 +150,10 @@ populateDeviceList();
 //Event listeners for divs.
 $('div.deviceContainer').click(fireCheck);
 $('input.deviceCheckbox').click(selectBox);
-//Event listener for return button.
+//Event listener for return selected.
 $('#returnbutton').click(returnDevice);
+//Event listener for return all.
+$('#returnall').click(returnAll);
 //Event listener for modal x button.
 $('#closeOrderForm').click(hidePopup);
 //Event listener exits modal when esc key pressed.
@@ -221,7 +227,7 @@ function populateDeviceList(){
 		//HTML representation in divs
 		htmlString+="<div class=\"deviceContainer\" data-num=\"" + i +"\">";
 		htmlString+="<input class=\"deviceCheckbox\" type = \"checkbox\" data-num=\"" + i + "\">";
-		htmlString+="<div><div class=\"imgContainer\"><img src=\"../imgs/my-icons-collection-devices/png/";
+		htmlString+="<div><div class=\"imgContainer\"><img onerror=\"this.src='../imgs/synchrony-financial-logo-dlpx_1.png';\" src=\"../imgs/my-icons-collection-devices/png/";
 		htmlString+=hardware;
 		htmlString+=".png\" class=\"device\">";
 		htmlString+=name;
@@ -252,6 +258,28 @@ function returnDevice()
 	$('#orderInfoModal').show();
 }
 
+//Initiates model to popup for review
+function returnAll(){
+	var checkboxes = document.getElementsByClassName('deviceCheckbox');
+	for(var i = 0; i < checkboxes.length; i++){
+		//get id
+		var id = checkboxes[i].getAttribute('data-num');
+		//Create query to get checkbox
+		var query = 'input[data-num="'+id+'"]';
+		var query2 = 'div[data-num="'+id+'"]';
+		//Determine if it's checked
+		var checked = $(query).prop('checked');
+		//Check it off
+		if(checked === false){
+			$(query).prop('checked',true);
+			$(query2).css("background-color","#C2C3C4");
+			//add to toReturned array
+			toReturn.push(id);
+		}
+	}
+	returnDevice();
+}
+
 //Call to exit modal
 function hidePopup(){
 	$('#orderInfoModal').hide();
diff --git a/WebContent/html/webpages/shoppingCart.jsp b/WebContent/html/webpages/shoppingCart.jsp
index 49fa859..92c0809 100644
--- a/WebContent/html/webpages/shoppingCart.jsp
+++ b/WebContent/html/webpages/shoppingCart.jsp
@@ -497,11 +497,6 @@ function selectAllDevices() {
     }
 }
 
-/**
-This function takes all devices in the shopping cart and orders them.
-**/
-function orderAll(){}
-
 /**
 This function takes all devices in the shopping cart and deletes them.
 **/
diff --git a/src/database/DeviceQueries.java b/src/database/DeviceQueries.java
index 2bbb939..5e3dc3a 100644
--- a/src/database/DeviceQueries.java
+++ b/src/database/DeviceQueries.java
@@ -3,7 +3,6 @@
 import java.sql.*;
 
 import entities.Device;
-import entities.RentedDevice;
 
 public class DeviceQueries {
 
@@ -11,13 +10,13 @@ public class DeviceQueries {
 	private static String user = "b372dfe7409692";
 	private static String password = "74f6e317";
 	
-	public static RentedDevice[] getUserDevices(String userID) throws SQLException, ClassNotFoundException{
+	public static Device[] getUserDevices(String userID) throws SQLException, ClassNotFoundException{
 		//Not sure how to get cookie information (if that is how we choose to accomplish this...) ? But this should be a passed parameter
 		System.getenv("VCAP_SERVICES");
 		Class.forName("com.mysql.jdbc.Driver");
 		Connection connection = DriverManager.getConnection(database, user, password);
 		Statement stmt = connection.createStatement();
-		ResultSet resultSet = stmt.executeQuery("SELECT Device_ID, Device_Name, Device_Description, Ticket_ID, Hardware, Model, Borrow_Date FROM devices WHERE Renter = " + userID + " AND Status <> \"Available\" AND Status <> \"Returning \"");
+		ResultSet resultSet = stmt.executeQuery("SELECT * FROM devices WHERE Renter = " + userID + " AND Status <> \"Available\" AND Status <> \"Returning \"");
 		int counter = 0;
 		
 		resultSet.last();
@@ -25,11 +24,11 @@ public static RentedDevice[] getUserDevices(String userID) throws SQLException,
 		resultSet.beforeFirst();
 		
 		//Covers amount of rows, and 6 attributes (indices 0-5)
-		RentedDevice[] devices = new RentedDevice[rows];
+		Device[] devices = new Device[rows];
 		
 		//iterate result set
 		while(resultSet.next()){
-			devices[counter] = new RentedDevice(resultSet.getInt("Device_ID") + "",resultSet.getString("Device_Name"),resultSet.getString("Device_Description"),resultSet.getInt("Ticket_ID") + "",resultSet.getString("Hardware"),resultSet.getString("Model"),resultSet.getString("Borrow_Date"));
+			devices[counter] = new Device(resultSet.getString("Device_Name"),resultSet.getInt("Device_ID"),resultSet.getString("Device_Description"),resultSet.getString("Hardware"), resultSet.getString("Model"), resultSet.getString("Manufacturer"), resultSet.getString("Status"), resultSet.getString("MAC_Address"), resultSet.getString("Serial_Num"), resultSet.getInt("NFC_ID"));
 			counter++;
 		}		
 		stmt.close();