Reactoring and updated the JSP.