diff --git a/java/2020Aug31/lecture2/src/main/java/com/github/perscholas/IndexController.java b/java/2020Aug31/lecture2/src/main/java/com/github/perscholas/IndexController.java
index 9c2e2cb..04b74f1 100644
--- a/java/2020Aug31/lecture2/src/main/java/com/github/perscholas/IndexController.java
+++ b/java/2020Aug31/lecture2/src/main/java/com/github/perscholas/IndexController.java
@@ -8,7 +8,7 @@
  * Created by leon on 8/31/2020.
  */
 @Controller
-@RequestMapping("/index-controller")
+@RequestMapping("/")
 @SessionAttributes("userKey")
 public class IndexController {
     
@@ -34,8 +34,8 @@ public ModelAndView userInfo(
         return mav;
     }
 
-    @RequestMapping(value = "/userInfoConfirm", method = RequestMethod.POST)
-    public ModelAndView userInfoConfirm(@RequestAttribute("userKey") User user) {
+    @PostMapping(value = "/userInfo_confirm")
+    public ModelAndView userInfoConfirm(@ModelAttribute("userKey") User u) {
         return new ModelAndView("user-account-page");
     }
     
diff --git a/java/2020Aug31/lecture2/src/main/java/com/github/perscholas/User.java b/java/2020Aug31/lecture2/src/main/java/com/github/perscholas/User.java
index ac481ae..7a28c4d 100644
--- a/java/2020Aug31/lecture2/src/main/java/com/github/perscholas/User.java
+++ b/java/2020Aug31/lecture2/src/main/java/com/github/perscholas/User.java
@@ -6,9 +6,8 @@
 /**
  * Created by leon on 8/31/2020.
  */
-@Entity
+
 public class User {
-    @Id
     private String username;
     private String password;
     private String email;
@@ -36,4 +35,6 @@ public String getEmail() {
     public void setEmail(String email) {
         this.email = email;
     }
+
+
 }
diff --git a/java/2020Aug31/lecture2/src/main/webapp/WEB-INF/jsp/index.jsp b/java/2020Aug31/lecture2/src/main/webapp/WEB-INF/jsp/index.jsp
index adf2cef..507f075 100644
--- a/java/2020Aug31/lecture2/src/main/webapp/WEB-INF/jsp/index.jsp
+++ b/java/2020Aug31/lecture2/src/main/webapp/WEB-INF/jsp/index.jsp
@@ -5,6 +5,11 @@
             <input type="text" id="user" name="username" />
         </div>
 
+        <div class="sub_field">
+            <label>Password</label>
+            <input type="password" id="pass" name="password" />
+        </div>
+
         <div class="sub_field">
             <label>Email</label>
             <input type="text" id="email" name="email" />
diff --git a/java/2020Aug31/lecture2/src/main/webapp/WEB-INF/jsp/user-account-modify.jsp b/java/2020Aug31/lecture2/src/main/webapp/WEB-INF/jsp/user-account-modify.jsp
index f323812..d81d4f5 100644
--- a/java/2020Aug31/lecture2/src/main/webapp/WEB-INF/jsp/user-account-modify.jsp
+++ b/java/2020Aug31/lecture2/src/main/webapp/WEB-INF/jsp/user-account-modify.jsp
@@ -1,11 +1,11 @@
-<% User u = (User)session.getAttribute("userKey"); %>
+<%@ page import="com.github.perscholas.User" %><% User u = (User)session.getAttribute("userKey"); %>
 <h1>Change User Information</h1>
 <div class="container">
     <form action="submit-changes" method="POST">
         <div class="sub_field">
             <label>User Name</label>
             <input type="text" id="user" name="username"
-                value=<%=u.getPassword()%> />
+                value=<%=u.getUsername()%> />
         </div>
         <div>
             <label>Password</label>
diff --git a/java/2020Aug31/lecture2/src/main/webapp/WEB-INF/jsp/user-account-page.jsp b/java/2020Aug31/lecture2/src/main/webapp/WEB-INF/jsp/user-account-page.jsp
index a4cb8f9..25d4838 100644
--- a/java/2020Aug31/lecture2/src/main/webapp/WEB-INF/jsp/user-account-page.jsp
+++ b/java/2020Aug31/lecture2/src/main/webapp/WEB-INF/jsp/user-account-page.jsp
@@ -1,14 +1,14 @@
-<% User u = (User)session.getAttribute("userKey"); %>
+<%@ page import="com.github.perscholas.User" %><% User u = (User)session.getAttribute("userKey"); %>
 
 <div class="user_table">
     <table>
         <tr>
             <td>User Name</td>
-            <td><%=u.getUsername()></td>
+            <td><%= u.getUsername() %></td>
         </tr>
         <tr>
             <td>Password</td>
-            <td><%=u.getUserPassword()></td>
+            <td><%= u.getPassword() %></td>
         </tr>
         <tr>
             <td>Email</td>
diff --git a/java/2020Aug31/lecture2/src/main/webapp/WEB-INF/jsp/user-page.jsp b/java/2020Aug31/lecture2/src/main/webapp/WEB-INF/jsp/user-page.jsp
index 6a35e0c..30b906b 100644
--- a/java/2020Aug31/lecture2/src/main/webapp/WEB-INF/jsp/user-page.jsp
+++ b/java/2020Aug31/lecture2/src/main/webapp/WEB-INF/jsp/user-page.jsp
@@ -1,17 +1,17 @@
 <h1>Confirm your Info</h1>
-<div class="conteiner">
+<div class="container">
     <form action="userInfo_confirm" method="POST">
         <div class="sub_field">
             <label>User Name</label>
-            <input type="text" id="user" name = "username" value=${username} />
+            <label for="user"></label><input type="text" id="user" name = "username" value=${username} />
         <div>
         <div class="sub_field">
             <label>Password</label>
-            <input type="text" id="password" name = "password" value=${password} />
+            <label for="pass"></label><input type="text" id="pass" name = "password" value=${password} />
         <div>
         <div class="sub_field">
             <label>Email</label>
-            <input type="text" id="email" name = "email" value=${email} />
+            <label for="email"></label><input type="text" id="email" name = "email" value=${email} />
         <div>
         <div class="btn">
             <input type="submit" name="submit" value="Submit Info" />