diff --git a/api/pom.xml b/api/pom.xml
index 2827f81..f9908c2 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.openmrs.module</groupId>
 		<artifactId>teammodule</artifactId>
-		<version>2.0.0</version>
+		<version>2.0.0A</version>
 	</parent>
 
 	<artifactId>teammodule-api</artifactId>
diff --git a/api/src/main/java/org/openmrs/module/teammodule/api/TeamMemberLogService.java b/api/src/main/java/org/openmrs/module/teammodule/api/TeamMemberLogService.java
index f873f0b..5f9e122 100644
--- a/api/src/main/java/org/openmrs/module/teammodule/api/TeamMemberLogService.java
+++ b/api/src/main/java/org/openmrs/module/teammodule/api/TeamMemberLogService.java
@@ -10,7 +10,9 @@
 public interface TeamMemberLogService extends OpenmrsService {
 
 	public void saveTeamMemberLog(TeamMemberLog teamMemberLog);
-	
+
+	public void updateTeamMemberLog(TeamMemberLog teamMemberLog);
+
 	public TeamMemberLog getTeamMemberLog(int id);
 	
 	public TeamMemberLog getTeamMemberLog(String uuid);
diff --git a/api/src/main/java/org/openmrs/module/teammodule/api/db/TeamMemberLogDAO.java b/api/src/main/java/org/openmrs/module/teammodule/api/db/TeamMemberLogDAO.java
index 9bbd5f5..592a3b2 100644
--- a/api/src/main/java/org/openmrs/module/teammodule/api/db/TeamMemberLogDAO.java
+++ b/api/src/main/java/org/openmrs/module/teammodule/api/db/TeamMemberLogDAO.java
@@ -8,6 +8,8 @@ public interface TeamMemberLogDAO {
 
 	public void saveTeamMemberLog(TeamMemberLog teamMemberLog);
 	
+	public void updateTeamMemberLog(TeamMemberLog teamMemberlog);
+
 	public TeamMemberLog getTeamMemberLog(int id);
 	
 	public TeamMemberLog getTeamMemberLog(String id);
diff --git a/api/src/main/java/org/openmrs/module/teammodule/api/db/hibernate/HibernateTeamMemberLogDAO.java b/api/src/main/java/org/openmrs/module/teammodule/api/db/hibernate/HibernateTeamMemberLogDAO.java
index ee5024f..60b81f8 100644
--- a/api/src/main/java/org/openmrs/module/teammodule/api/db/hibernate/HibernateTeamMemberLogDAO.java
+++ b/api/src/main/java/org/openmrs/module/teammodule/api/db/hibernate/HibernateTeamMemberLogDAO.java
@@ -37,6 +37,10 @@ public void saveTeamMemberLog(TeamMemberLog teamMemberLog) {
 		sessionFactory.getCurrentSession().saveOrUpdate(teamMemberLog);
 	}
 
+	public void updateTeamMemberLog(TeamMemberLog teamMemberLog) {
+		sessionFactory.getCurrentSession().update(teamMemberLog);
+	}
+
 	public TeamMemberLog getTeamMemberLog(int id) {
 		return	(TeamMemberLog)sessionFactory.getCurrentSession().createQuery("from TeamMemberLog teamMemberLog where teamMemberLog.logId = :id").setInteger("id", id).uniqueResult();
 	}
diff --git a/api/src/main/java/org/openmrs/module/teammodule/api/impl/TeamMemberLogServiceImpl.java b/api/src/main/java/org/openmrs/module/teammodule/api/impl/TeamMemberLogServiceImpl.java
index a50c4f8..6029566 100644
--- a/api/src/main/java/org/openmrs/module/teammodule/api/impl/TeamMemberLogServiceImpl.java
+++ b/api/src/main/java/org/openmrs/module/teammodule/api/impl/TeamMemberLogServiceImpl.java
@@ -32,6 +32,10 @@ public void saveTeamMemberLog(TeamMemberLog teamMemberlog) {
 		dao.saveTeamMemberLog(teamMemberlog);
 	}
 
+	public void updateTeamMemberLog(TeamMemberLog teamMemberlog) {
+		dao.updateTeamMemberLog(teamMemberlog);
+	}
+
 	public List<TeamMemberLog> getAllLogs(Integer offset, Integer pageSize) {
 		return dao.getAllLogs(offset, pageSize);
 	}
diff --git a/api/src/main/java/org/openmrs/module/teammodule/api/impl/TeamServiceImpl.java b/api/src/main/java/org/openmrs/module/teammodule/api/impl/TeamServiceImpl.java
index 81ec706..4a45b6f 100644
--- a/api/src/main/java/org/openmrs/module/teammodule/api/impl/TeamServiceImpl.java
+++ b/api/src/main/java/org/openmrs/module/teammodule/api/impl/TeamServiceImpl.java
@@ -85,7 +85,6 @@ public void updateTeam(Team team) {
 
 	@Override
 	public Team getTeam(String teamName, int locationid) {
-		// TODO Auto-generated method stub
 		return dao.getTeam(teamName,locationid);
 	}
 
diff --git a/omod/pom.xml b/omod/pom.xml
index 5090c21..310a592 100644
--- a/omod/pom.xml
+++ b/omod/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.openmrs.module</groupId>
 		<artifactId>teammodule</artifactId>
-		<version>2.0.0</version>
+		<version>2.0.0A</version>
 	</parent>
 
 	<artifactId>teammodule-omod</artifactId>
diff --git a/omod/src/main/java/org/openmrs/module/teammodule/extension/html/AdminList.java b/omod/src/main/java/org/openmrs/module/teammodule/extension/html/AdminList.java
index 927cee6..a681fbb 100644
--- a/omod/src/main/java/org/openmrs/module/teammodule/extension/html/AdminList.java
+++ b/omod/src/main/java/org/openmrs/module/teammodule/extension/html/AdminList.java
@@ -36,9 +36,10 @@ public Map<String, String> getLinks() {
 		LinkedHashMap<String, String> map = new LinkedHashMap<String, String>();
 		map.put("module/teammodule/addTeam.form", "New Team");
 		map.put("module/teammodule/teamMemberAddForm.form", "New Team Member");
-		map.put("module/teammodule/teamRole.form", "Team Hierarchy (Roles)");
+		map.put("module/teammodule/addRole.form", "New Team Hierarchy (Role)");
 		map.put("module/teammodule/team.form", "Manage Teams");
 		map.put("module/teammodule/teamMemberView.form", "Manage Team Members");
+		map.put("module/teammodule/teamRole.form", "Manage Team Hierarchy (Roles)");
 		return map;
 	}
 }
diff --git a/omod/src/main/java/org/openmrs/module/teammodule/web/controller/RoleAddFormController.java b/omod/src/main/java/org/openmrs/module/teammodule/web/controller/RoleAddFormController.java
index 720eed3..74ca9d0 100644
--- a/omod/src/main/java/org/openmrs/module/teammodule/web/controller/RoleAddFormController.java
+++ b/omod/src/main/java/org/openmrs/module/teammodule/web/controller/RoleAddFormController.java
@@ -72,11 +72,14 @@ public String showForm(Model model, HttpServletRequest request) {
 
 	@RequestMapping(method = RequestMethod.POST)
 	public String onSubmit(HttpSession httpSession, @ModelAttribute("anyRequestObject") Object anyRequestObject, HttpServletRequest request,
-	@ModelAttribute("roleData") TeamRole teamRole,  Model model) {
-		
+	@ModelAttribute("roleData") TeamRole teamRole, Model model) {
+		String reportsToUuid = request.getParameter("reportsTo"); 
+		System.out.println("reportsTo: " + reportsToUuid);
+		TeamRole tr = Context.getService(TeamRoleService.class).getTeamRoleByUuid(reportsToUuid); 
+		if(tr!=null) { teamRole.setReportTo(tr); }
 		teamRole.setUuid(UUID.randomUUID().toString());
 		Context.getService(TeamRoleService.class).saveTeamRole(teamRole);
-		String saved = "Role saved successfully";
+		String saved = "Role Saved Successfully";
 		model.addAttribute("saved", saved);
 		List<TeamRole> roles = Context.getService(TeamRoleService.class).getAllTeamRole();
 		model.addAttribute("reportsTo", roles);
@@ -86,4 +89,4 @@ public String onSubmit(HttpSession httpSession, @ModelAttribute("anyRequestObjec
 
 	
 
-}
+}
\ No newline at end of file
diff --git a/omod/src/main/java/org/openmrs/module/teammodule/web/controller/RoleEditFormController.java b/omod/src/main/java/org/openmrs/module/teammodule/web/controller/RoleEditFormController.java
index 0f3a592..7e56ca0 100644
--- a/omod/src/main/java/org/openmrs/module/teammodule/web/controller/RoleEditFormController.java
+++ b/omod/src/main/java/org/openmrs/module/teammodule/web/controller/RoleEditFormController.java
@@ -4,7 +4,6 @@
 package org.openmrs.module.teammodule.web.controller;
 
 import java.util.List;
-import java.util.UUID;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
@@ -12,8 +11,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.openmrs.api.context.Context;
-//import org.openmrs.module.teammodule.api.TeamMemberService;
-//import org.openmrs.module.teammodule.api.TeamMemberService;
 import org.openmrs.module.teammodule.Team;
 import org.openmrs.module.teammodule.TeamRole;
 import org.openmrs.module.teammodule.api.TeamRoleService;
@@ -46,11 +43,19 @@ public class RoleEditFormController {
 	 * @return String form view name
 	 */
 	@RequestMapping(method = RequestMethod.GET)
-	public String showForm(Model model, HttpServletRequest request,@RequestParam(value = "roleId", required = true) int id, @ModelAttribute("teamData") Team team) {
+	public String showForm(Model model, HttpServletRequest request,@RequestParam(value = "roleId", required = true) String uuid, @ModelAttribute("teamData") Team team) {
 
-		TeamRole roleData = Context.getService(TeamRoleService.class).getTeamRoleById(id);
+		System.out.println(uuid);
+		TeamRole roleData = Context.getService(TeamRoleService.class).getTeamRoleByUuid(uuid);
 		List<TeamRole> roles = Context.getService(TeamRoleService.class).getAllTeamRole();
-		model.addAttribute("reportsTo", roles);
+
+		
+		System.out.println(uuid);
+		System.out.println(roles);
+		System.out.println(roleData);
+
+		model.addAttribute("reportsToOptions", roles);
+		model.addAttribute("reportsTo", roleData.getReportTo());
 		model.addAttribute("roleData", roleData);
 		
 		return SUCCESS_FORM_VIEW;
@@ -69,10 +74,13 @@ public String showForm(Model model, HttpServletRequest request,@RequestParam(val
 	@RequestMapping(method = RequestMethod.POST)
 	public String onSubmit(HttpSession httpSession, @ModelAttribute("anyRequestObject") Object anyRequestObject, HttpServletRequest request,
 	@ModelAttribute("roleData") TeamRole teamRole,  Model model) {
-		
-		teamRole.setUuid(UUID.randomUUID().toString());
+		String reportsToUuid = request.getParameter("reportsTo"); 
+		System.out.println("reportsTo: " + reportsToUuid);
+		TeamRole tr = Context.getService(TeamRoleService.class).getTeamRoleByUuid(reportsToUuid); 
+		if(tr!=null) { teamRole.setReportTo(tr); }
+		//teamRole.setUuid(UUID.randomUUID().toString());
 		Context.getService(TeamRoleService.class).saveTeamRole(teamRole);
-		String saved = "Role saved successfully";
+		String saved = "Role Updated Successfully";
 		model.addAttribute("saved", saved);
 		TeamRole roleData = Context.getService(TeamRoleService.class).getTeamRoleById(teamRole.getTeamRoleId());
 		model.addAttribute("roleData", roleData);
@@ -80,7 +88,7 @@ public String onSubmit(HttpSession httpSession, @ModelAttribute("anyRequestObjec
 		List<TeamRole> roles = Context.getService(TeamRoleService.class).getAllTeamRole();
 		model.addAttribute("reportsTo", roles);
 
-		return "redirect:/module/teammodule/editRole.form?teamId=" + teamRole.getTeamRoleId();
+		return SUCCESS_FORM_VIEW;
 	}
 
 	
diff --git a/omod/src/main/java/org/openmrs/module/teammodule/web/controller/TeamEditFormController.java b/omod/src/main/java/org/openmrs/module/teammodule/web/controller/TeamEditFormController.java
index d7bf064..08a4e51 100644
--- a/omod/src/main/java/org/openmrs/module/teammodule/web/controller/TeamEditFormController.java
+++ b/omod/src/main/java/org/openmrs/module/teammodule/web/controller/TeamEditFormController.java
@@ -47,6 +47,7 @@ public String showFormEidt(Model model, HttpServletRequest request, @RequestPara
 		teamData = Context.getService(TeamService.class).getTeam(teamId);
 		String error = request.getParameter("error");
 		model.addAttribute("error", error);
+		model.addAttribute("defaultLocation", teamData.getLocation());
 		String edit = request.getParameter("edit");
 		model.addAttribute("edit", edit);
 		model.addAttribute("teamData", teamData);
@@ -60,6 +61,12 @@ public String showFormEdit(Model model, HttpServletRequest request, @RequestPara
 		Location location = Context.getLocationService().getLocationByUuid(locationUuid);
 		teamData = Context.getService(TeamService.class).getTeam(teamName, location.getLocationId());
 		String error = request.getParameter("error");
+		System.out.println(teamData);
+		System.out.println(teamData.getLocation());
+		System.out.println(teamData.getLocation());
+		model.addAttribute("defaultLocation", location);
+		model.addAttribute("locations", Context.getLocationService().getAllLocations());
+		
 		model.addAttribute("error", error);
 		String edit = request.getParameter("edit");
 		model.addAttribute("edit", edit);
diff --git a/omod/src/main/java/org/openmrs/module/teammodule/web/resource/TeamMemberLogRequestResource.java b/omod/src/main/java/org/openmrs/module/teammodule/web/resource/TeamMemberLogRequestResource.java
index 31076d2..efc9d58 100644
--- a/omod/src/main/java/org/openmrs/module/teammodule/web/resource/TeamMemberLogRequestResource.java
+++ b/omod/src/main/java/org/openmrs/module/teammodule/web/resource/TeamMemberLogRequestResource.java
@@ -11,6 +11,8 @@
 import org.openmrs.module.webservices.rest.web.RestConstants;
 import org.openmrs.module.webservices.rest.web.annotation.PropertyGetter;
 import org.openmrs.module.webservices.rest.web.annotation.Resource;
+import org.openmrs.module.webservices.rest.web.representation.DefaultRepresentation;
+import org.openmrs.module.webservices.rest.web.representation.FullRepresentation;
 import org.openmrs.module.webservices.rest.web.representation.Representation;
 import org.openmrs.module.webservices.rest.web.resource.impl.DataDelegatingCrudResource;
 import org.openmrs.module.webservices.rest.web.resource.impl.DelegatingResourceDescription;
@@ -30,15 +32,48 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 		DelegatingResourceDescription description = null;
 		if (Context.isAuthenticated()) {
 			description = new DelegatingResourceDescription();
-				description.addProperty("logId");
+			if (rep instanceof DefaultRepresentation) {
+				description.addProperty("display");
 				description.addProperty("teamMember");
 				description.addProperty("action");
 				description.addProperty("dataNew");
 				description.addProperty("dataOld");
 				description.addProperty("log");
-				description.addProperty("dateCreated");
+			} else if (rep instanceof FullRepresentation) {
+				description.addProperty("display");
+				description.addProperty("teamMember");
+				description.addProperty("action");
+				description.addProperty("dataNew");
+				description.addProperty("dataOld");
+				description.addProperty("log");
+				description.addProperty("auditInfo");
+				description.addSelfLink();
+			}
 		}
-
+		return description;
+	}
+	
+	@Override
+	public DelegatingResourceDescription getCreatableProperties() {
+		DelegatingResourceDescription description = new DelegatingResourceDescription();
+		description.addProperty("display");
+		description.addProperty("teamMember");
+		description.addProperty("action");
+		description.addProperty("dataNew");
+		description.addProperty("dataOld");
+		description.addProperty("log");
+		return description;
+	}
+	
+	@Override
+	public DelegatingResourceDescription getUpdatableProperties()  {
+		DelegatingResourceDescription description = new DelegatingResourceDescription();
+		description.addProperty("display");
+		description.addProperty("teamMember");
+		description.addProperty("action");
+		description.addProperty("dataNew");
+		description.addProperty("dataOld");
+		description.addProperty("log");
 		return description;
 	}
 
@@ -48,18 +83,22 @@ public TeamMemberLog newDelegate() {
 	}
 
 	@Override
-	public TeamMemberLog save(TeamMemberLog teamLog) {
-		return null;
+	public TeamMemberLog save(TeamMemberLog delegate) {
+		try {
+			if(delegate.getId() != null && delegate.getId() > 0) { Context.getService(TeamMemberLogService.class).updateTeamMemberLog(delegate); return delegate; }
+			else { Context.getService(TeamMemberLogService.class).saveTeamMemberLog(delegate); return delegate; }
+		}
+		catch(Exception e) { e.printStackTrace(); throw new RuntimeException(e); }
 	}
 
 	@Override
-	protected void delete(TeamMemberLog teamMemberLog, String reason, RequestContext context) throws ResponseException {
-		// TODO Auto-generated method stub
+	protected void delete(TeamMemberLog delegate, String reason, RequestContext context) throws ResponseException {
+		Context.getService(TeamMemberLogService.class).purgeTeamMemberLog(delegate);
 	}
 
 	@Override
-	public void purge(TeamMemberLog arg0, RequestContext arg1) throws ResponseException {
-		// TODO Auto-generated method stub
+	public void purge(TeamMemberLog delegate, RequestContext arg1) throws ResponseException {
+		Context.getService(TeamMemberLogService.class).purgeTeamMemberLog(delegate);
 	}
 	
 	@Override
@@ -69,17 +108,13 @@ public SimpleObject search(RequestContext context) {
 	}
 	
 	@PropertyGetter("display")
-	public List<TeamMemberLog> getDisplayString(int team) {
-		return Context.getService(TeamMemberLogService.class).searchTeamMemberLogByTeamMember(team);
+	public String getDisplayString(TeamMemberLog teamMemberLog) {
+		if (teamMemberLog == null) { return ""; } return teamMemberLog.getTeamMember().getPerson().getPersonName().toString();
 	}
-
+	
 	@Override
 	public TeamMemberLog getByUniqueId(String uniqueId) {
 		return Context.getService(TeamMemberLogService.class).getTeamMemberLog(uniqueId);
 	}
-	
-	public TeamMemberLog getById(Integer id) {
-		return Context.getService(TeamMemberLogService.class).getTeamMemberLog(id);
-	}
 }
 
diff --git a/omod/src/main/java/org/openmrs/module/teammodule/web/resource/TeamMemberRequestResource.java b/omod/src/main/java/org/openmrs/module/teammodule/web/resource/TeamMemberRequestResource.java
index fd98f67..988091d 100644
--- a/omod/src/main/java/org/openmrs/module/teammodule/web/resource/TeamMemberRequestResource.java
+++ b/omod/src/main/java/org/openmrs/module/teammodule/web/resource/TeamMemberRequestResource.java
@@ -75,7 +75,6 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 				description.addProperty("teamRole", Representation.DEFAULT);
 				description.addProperty("locations", Representation.DEFAULT);
 				description.addProperty("patients", Representation.DEFAULT);
-
 			} else if (rep instanceof FullRepresentation) {
 				description.addProperty("display");
 				description.addProperty("identifier");
@@ -259,8 +258,9 @@ public String getDisplayString(TeamMember teamMember) {
 	}
 	
 	@PropertyGetter("subTeams")
-	public String getSubTeam(TeamMember teamMember) {
-		List<Team> teams = Context.getService(TeamService.class).getSubTeams(teamMember); if(teams == null) { return ""; } else { String str = ""; for (int i = 0; i < teams.size(); i++) { if(i==teams.size()-1) { str += teams.get(i).getTeamName(); } else { str += teams.get(i).getTeamName() + ", "; } } return str; }
+	public List<Team> getSubTeam(TeamMember teamMember) {
+		List<Team> teams = Context.getService(TeamService.class).getSubTeams(teamMember); //if(teams == null) { return ""; } else { String str = ""; for (int i = 0; i < teams.size(); i++) { if(i==teams.size()-1) { str += teams.get(i).getTeamName(); } else { str += teams.get(i).getTeamName() + ", "; } } return str; }
+		if(teams == null) return null; else { return teams; } 
 	}
 	
 	@PropertyGetter("subTeamRoles")
diff --git a/omod/src/main/java/org/openmrs/module/teammodule/web/resource/TeamRequestResource.java b/omod/src/main/java/org/openmrs/module/teammodule/web/resource/TeamRequestResource.java
index 68ea575..8c65bce 100644
--- a/omod/src/main/java/org/openmrs/module/teammodule/web/resource/TeamRequestResource.java
+++ b/omod/src/main/java/org/openmrs/module/teammodule/web/resource/TeamRequestResource.java
@@ -114,8 +114,18 @@ else if(context.getParameter("supervisor")!=null) {
 			listTeam.add(team);
 			return new NeedsPaging<Team>(listTeam, context).toSimpleObject(this);
 		}
+		else if(context.getParameter("teamName")!=null && context.getParameter("locationId")!=null && context.getParameter("identifier")!=null) {
+			Location l = Context.getLocationService().getLocationByUuid(context.getParameter("locationId"));
+			Team team = (Context.getService(TeamService.class).searchTeam(context.getParameter("teamName"))).get(0);
+			team.setTeamIdentifier(context.getParameter("identifier"));
+			team.setLocation(l);
+			Context.getService(TeamService.class).updateTeam(team);
+			List<Team> listTeam = new ArrayList<>();
+			listTeam.add(team);
+			return new NeedsPaging<Team>(listTeam, context).toSimpleObject(this);
+		}
 		else if(context.getParameter("teamName")!=null && context.getParameter("locationId")!=null) {
-			Team team = Context.getService(TeamService.class).getTeam(context.getParameter("teamName"),Integer.parseInt(context.getParameter("locationId")));
+			Team team = Context.getService(TeamService.class).getTeam(context.getParameter("teamName"), Integer.parseInt(context.getParameter("locationId")));
 			List<Team> listTeam = new ArrayList<>();
 			listTeam.add(team);
 			return new NeedsPaging<Team>(listTeam, context).toSimpleObject(this);
diff --git a/omod/src/main/java/org/openmrs/module/teammodule/web/resource/TeamRoleRequestResource.java b/omod/src/main/java/org/openmrs/module/teammodule/web/resource/TeamRoleRequestResource.java
index 200bc30..bfee1b7 100644
--- a/omod/src/main/java/org/openmrs/module/teammodule/web/resource/TeamRoleRequestResource.java
+++ b/omod/src/main/java/org/openmrs/module/teammodule/web/resource/TeamRoleRequestResource.java
@@ -37,14 +37,14 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 			description.addProperty("uuid");
 			description.addProperty("name");
 			description.addProperty("ownsTeam");
-			description.addProperty("reportTo");
+			description.addProperty("reportToName");
 			description.addProperty("reportByName");
 			} else if (rep instanceof FullRepresentation) {
 			description.addProperty("display");
 			description.addProperty("name");
 			description.addProperty("uuid");
 			description.addProperty("ownsTeam");
-			description.addProperty("reportTo");
+			description.addProperty("reportToName");
 			description.addProperty("reportByName");
 			description.addProperty("auditInfo");
 			description.addSelfLink();
@@ -93,7 +93,7 @@ public String getDisplayString(TeamRole teamRole) {
 		if(teamRole == null) { return ""; } return teamRole.getName();
 	}
 	
-	@PropertyGetter("reportTo")
+	@PropertyGetter("reportToName")
 	public String getReportToName(TeamRole teamRole) {
 		if(teamRole == null || teamRole.getReportTo() == null) { return ""; } return teamRole.getReportTo().getName();
 	}
diff --git a/omod/src/main/webapp/roleAddForm.jsp b/omod/src/main/webapp/roleAddForm.jsp
index 0aa6ce7..213c078 100644
--- a/omod/src/main/webapp/roleAddForm.jsp
+++ b/omod/src/main/webapp/roleAddForm.jsp
@@ -14,22 +14,20 @@
 <script src="/openmrs/moduleResources/teammodule/alertify.min.js"></script>
 
 <script type="text/javascript">
-
 	jQuery(document).ready(function() {
 		jQuery("#ownsTeam").attr('checked', false);
 	});
 	function validation() {
 		document.getElementById("saveButton").disabled = true;
 		var name = roleName.value;
-		var reportsTo = document.getElementById("reportsTo");
-		var selectedValue = reportsTo.options[reportsTo.selectedIndex].value;
+		var reportsTo = document.getElementById("reportsTo").value;
 		var mustSelectMessage = "";
 		if (name == null || name == "") {
 			mustSelectMessage += "Role name can't be empty.";
 			alertify.alert(mustSelectMessage);
 			document.getElementById("saveButton").disabled = false;
 		}
-		if (selectedValue == 0) {
+		if (reportsTo == 0) {
 			mustSelectMessage += "Must Select Report To Field";
 			alertify.alert(mustSelectMessage);
 			document.getElementById("saveButton").disabled = false;
@@ -42,8 +40,7 @@
 				contentType : "application/json;charset=UTF-8",
 				dataType : "json",
 				success : function(data, status) {
-					if(status==200)
-						document.getElementById("saveRole").submit();
+					document.getElementById("saveRole").submit();
 				}
 			});
 		}
@@ -51,6 +48,9 @@
 </script>
 
 <h2 align="center">Add Role</h2>
+<h3 style="color: red; display: inline">${error}</h3>
+<h3 align="center" style="color: green;">${saved}</h3>
+<h3 style="color: green; display: inline">${edit}</h3>
 <table class="role">
 	<form:form id="saveRole" name="saveRole" method="post" commandName="roleData">
 		<tr>
@@ -60,13 +60,12 @@
 		</tr>
 		<tr>
 			<td>Reports To</td>
-			<td><form:select id="reportsTo" path="reportTo"
-					cssStyle="width:165px">
-					<form:option value="0" label=" Please Select " />
+			<td><select id="reportsTo" name="reportsTo" style="width:165px">
+					<option value="0" label=" Please Select " />
 					<c:forEach var="reportsTo" items="${reportsTo}" varStatus="loop">
-						<form:option value="${reportsTo}">${reportsTo.name}</form:option>
+						<option value="${reportsTo.uuid}">${reportsTo.name}</option>
 					</c:forEach>
-				</form:select>
+				<select>
 		</tr>
 		<tr>
 			<td>Owns Team ?</td>
diff --git a/omod/src/main/webapp/roleEditForm.jsp b/omod/src/main/webapp/roleEditForm.jsp
index 7b7e00f..96da522 100644
--- a/omod/src/main/webapp/roleEditForm.jsp
+++ b/omod/src/main/webapp/roleEditForm.jsp
@@ -17,19 +17,22 @@
 
 	jQuery(document).ready(function() {
 		jQuery("#ownsTeam").attr('checked', false);
+		console.log("edit")
 	});
 	function validation() {
 		document.getElementById("saveButton").disabled = true;
 		var name = roleName.value;
-		var reportsTo = document.getElementById("reportsTo");
-		var selectedValue = reportsTo.options[reportsTo.selectedIndex].value;
+		var reportsTo = document.getElementById("reportsTo").value;
+		
+		console.log("name: "+name);
+		console.log("reportsTo: "+reportsTo);
 		var mustSelectMessage = "";
 		if (name == null || name == "") {
 			mustSelectMessage += "Role name can't be empty.";
 			alertify.alert(mustSelectMessage);
 			document.getElementById("saveButton").disabled = false;
 		}
-		if (selectedValue == 0) {
+		if (reportsTo == 0) {
 			mustSelectMessage += "Must Select Report To Field";
 			alertify.alert(mustSelectMessage);
 			document.getElementById("saveButton").disabled = false;
@@ -42,7 +45,9 @@
 				contentType : "application/json;charset=UTF-8",
 				dataType : "json",
 				success : function(data, status) {
-						document.getElementById("saveRole").submit();
+					console.log(data)
+					console.log(status)
+					document.getElementById("saveRole").submit();
 				}
 			});
 		}
@@ -51,6 +56,9 @@
 </script>
 
 <h2 align="center">Edit Role</h2>
+<h3 style="color: red; display: inline">${error}</h3>
+<h3 align="center" style="color: green;">${saved}</h3>
+<h3 style="color: green; display: inline">${edit}</h3>
 <table class="role">
 	<form:form id="saveRole" name="saveRole" method="post" commandName="roleData">
 		<tr>
@@ -60,13 +68,16 @@
 		</tr>
 		<tr>
 			<td>Reports To</td>
-			<td><form:select id="reportsTo" path="reportTo"
-					cssStyle="width:165px">
-					<form:option value="0" label=" Please Select " />
-					<c:forEach var="reportsTo" items="${reportsTo}" varStatus="loop">
-						<form:option value="${reportsTo.teamRoleId}">${reportsTo.name}</form:option>
-					</c:forEach>
-				</form:select>
+			<td>
+			<select id="reportsTo" name="reportsTo" style="width:165px">
+				<option value="${reportsTo.uuid}">${reportsTo.name}</option>
+				<c:forEach var="reportsToOptions" items="${reportsToOptions}" varStatus="loop">
+					<c:if test="${reportsToOptions.uuid ne reportsTo.uuid}">
+						<option value="${reportsToOptions.uuid}">${reportsToOptions.name}</option>
+					</c:if>
+				</c:forEach>
+			</select>
+			</td>
 		</tr>
 		<tr>
 			<td>Owns Team ?</td>
diff --git a/omod/src/main/webapp/team.jsp b/omod/src/main/webapp/team.jsp
index eb9b7da..479a323 100644
--- a/omod/src/main/webapp/team.jsp
+++ b/omod/src/main/webapp/team.jsp
@@ -41,16 +41,16 @@
 			GenerateTable();
 			$('#general').DataTable({
 				"language": {
-					 			        "search": "_INPUT_",
-					 			        "searchPlaceholder": "Search..."
-					 			    },
-					 			    "paging" : true,
-					 				"lengthChange" : false,
-					 				"searching" : true,
-					 				"ordering" : true,
-					 				"info" : false,
-					 				"autoWidth" : true,
-					 				"sDom" : 'lfrtip',
+ 			        "search": "_INPUT_",
+ 			        "searchPlaceholder": "Search..."
+ 			    },
+ 			    "paging" : true,
+ 				"lengthChange" : false,
+ 				"searching" : true,
+ 				"ordering" : true,
+ 				"info" : false,
+ 				"autoWidth" : true,
+ 				"sDom" : 'lfrtip',
 			});
 		});
 	  });
diff --git a/omod/src/main/webapp/teamAddForm.jsp b/omod/src/main/webapp/teamAddForm.jsp
index 1fe4fcc..5cb4ab9 100644
--- a/omod/src/main/webapp/teamAddForm.jsp
+++ b/omod/src/main/webapp/teamAddForm.jsp
@@ -16,22 +16,12 @@
 <script type="text/javascript">
 	   \$j=jQuery;
 	 jQuery(document).ready(function() {
-		 jQuery("#voided").attr('checked',false);
-		 jQuery("#voidReason").val("");
 		 jQuery("#nameTip").hide();
 		 jQuery("#idTip").hide();
-		 jQuery("#voidTip").hide();
 		 document.getElementById("teamName").value = "";
 		 document.getElementById("teamIdentifier").value = "";
-		 
-		 jQuery('#voided').change(function(){
-		        if(this.checked)
-		            jQuery('#voidTip').show();
-		        else
-		            jQuery('#voidTip').hide();
-
-		    });
-	 }); 
+	 });
+	 
 	function validation() {
 		document.getElementById("saveButton").disabled = true;
 		var regexp = /^[a-z/i][a-z\- ]*[a-z/i\-|0-9]{2,}$/i;
@@ -40,7 +30,6 @@
 		var id = teamIdentifier.value;
 		var location = document.getElementById("location");
 		var selectedValue = location.options[location.selectedIndex].value;
-		var reason = voidReason.value;
 		var mustSelectMessage= "";
 		var dataTypeMessage = "";
 		if (name == null || name == "") {
@@ -57,9 +46,6 @@
 		}  if (selectedValue == 0) {
 			mustSelectMessage += "<br>Please select a location.";
 			//alertify.alert("Please select a location");
-		} if (document.getElementById("voided").checked && (reason == null || reason == "")) {
-			mustSelectMessage += "<br>Either write a reason or uncheck the box please.";
-			//alertify.alert("Either write a reason or uncheck the box please");
 		} 
 			 if(mustSelectMessage != ""){
 					alertify.alert(mustSelectMessage);
@@ -74,22 +60,19 @@
 						  contentType:"application/json;charset=UTF-8",
 						  dataType:"json",
 						  success: function(data,status){
-						if(status==200)
-							{
 							document.getElementById("saveTeam").submit();
-							}
 						  }
-						  });
+				 });
 			}			 
 				
 		}
 
 </script>
 
+<h2 align="center">Add Team</h2>
 <h3 style="color: red; display: inline">${error}</h3>
 <h3 align="center" style="color: green;">${saved}</h3>
 <h3 style="color: green; display: inline">${edit}</h3>
-<h2 align="center">Add Team</h2>
 <table class="team">
 	<form:form id="saveTeam" name="saveTeam" method="post" commandName="teamData">
 		<tr>
@@ -123,19 +106,6 @@
 					</c:forEach>
 				</form:select><span style="color: red">*</span></td>
 		</tr>
-		<tr>
-			<td>Retire Team ?</td>
-			<td><form:checkbox id="voided" path="voided" /></td>
-			<!-- USE VOIDED STUPID -->
-		</tr>
-		<tr><td></td>
-			<td><span id="voidTip">Reason
-					must be written</span></td>
-		</tr>
-		<tr>
-			<td>Retire Reason</td>
-			<td><form:textarea id="voidReason" path="voidReason" /></td>
-		</tr>
 		<tr>
 			<input type="hidden" value="save" name="type" />
 			<td></td>
diff --git a/omod/src/main/webapp/teamEditForm.jsp b/omod/src/main/webapp/teamEditForm.jsp
index 32e9971..d016249 100644
--- a/omod/src/main/webapp/teamEditForm.jsp
+++ b/omod/src/main/webapp/teamEditForm.jsp
@@ -31,6 +31,7 @@
 	 }); 
 	function validation() {
 		document.getElementById("saveButton").disabled = true;
+		document.getElementById("teamName").disabled = true;
 		var regexp = /^[a-z/i][a-z\- ]*[a-z/i\-|0-9]{2,}$/i;
 		var idRegExp = /^[a-z|0-9]+[a-z.\-_]*[a-z|0-9]{2,}$/i;
 		var name = teamName.value;
@@ -64,18 +65,16 @@
 					alertify.alert(dataTypeMessage);
 					document.getElementById("saveButton").disabled = false;
 				}else{jQuery.ajax({
-					  url:"/openmrs/ws/rest/v1/team/team?teamName="+name+"&locationId="+selectedValue+"&v=full",
+					  url:"/openmrs/ws/rest/v1/team/team?identifier="+id+"&teamName="+name+"&locationId="+selectedValue+"&v=full",
 					  type:"GET",
 					  contentType:"application/json;charset=UTF-8",
 					  dataType:"json",
 					  success: function(data,status){
-					alert(status)
-					if(status==200)
-						{
-						document.getElementById("saveTeam").submit();
-						}
+							//document.getElementById("saveTeam").submit();
+							document.getElementById("savedId").innerHTML = "Team Updated Successfully";
+							document.getElementById("saveButton").disabled = false;
 					  }
-					  });
+				  });
 			}
 			 
 				
@@ -83,10 +82,10 @@
 
 </script>
 
-<h3 style="color: red; display: inline">${error}</h3>
-<h3 style="color: green; display: inline">${saved}</h3>
-<h3 align="center" style="color: green;">${edit}</h3>
 <h2 align="center">Edit Team</h2>
+<h3 id="errorId" style="color: red; display: inline">${error}</h3>
+<h3 id="savedId" align="center" style="color: green;">${saved}</h3>
+<h3 id="editId" align="center" style="color: green;">${edit}</h3>
 <table class="team">
 	<form:form id="saveTeam" name="saveTeam" method="post"
 		commandName="teamData">
@@ -94,10 +93,10 @@
 			<td>Team Name</td>
 			<td><form:input id="teamName" path="teamName" maxlength="20"
 					onfocus="jQuery('#nameTip').show();"
-					onblur="jQuery('#nameTip').hide();" /><span style="color: red">*</span>
+					onblur="jQuery('#nameTip').hide();" readonly="true" /><!-- <span style="color: red">*</span> -->
 			</td>
-			<td><span id="nameTip">Must start with alphabet.Min 3 and
-					max 20.Alphanumeric text,- is allowed</span></td>
+			<td><!-- <span id="nameTip">Must start with alphabet.Min 3 and
+					max 20.Alphanumeric text,- is allowed</span> --></td>
 		<tr>
 			<td>Team Identifier</td>
 			<td><form:input id="teamIdentfier" path="teamIdentifier"
@@ -111,13 +110,15 @@
 			<td><form:select id="location" path="location"
 					cssStyle="width:165px">
 					<!-- <form:option value="0" label=" Please Select " /> -->
-					<form:option value="${defaultLocation.locationId}">${defaultLocation.name}</form:option>
-					<c:forEach var="location" items="${location}" varStatus="loop">
-						<c:if test="${location.locationId ne defaultLocation.locationId}">
-							<form:option value="${location.locationId}">${location.name}</form:option>
+					<form:option value="${defaultLocation.uuid}">${defaultLocation.name}</form:option>
+					<c:forEach var="locations" items="${locations}" varStatus="loop">
+						<c:if test="${locations.uuid ne defaultLocation.uuid}">
+							<form:option value="${locations.uuid}">${locations.name}</form:option>
 						</c:if>
 					</c:forEach>
 				</form:select><span style="color: red">*</span></td>
+				
+				
 		</tr>
 		<tr>
 			<td>Retire Team ?</td>
diff --git a/omod/src/main/webapp/teamMemberAddForm.jsp b/omod/src/main/webapp/teamMemberAddForm.jsp
index 9e5c914..bf5d90d 100644
--- a/omod/src/main/webapp/teamMemberAddForm.jsp
+++ b/omod/src/main/webapp/teamMemberAddForm.jsp
@@ -432,15 +432,8 @@
 				 Choose Existing Person
 			</td>
 			<td></td>
+			<td></td>
 		</tr>
-		<!-- <tr id="heading">
-			<td>
-				style="padding-left: 5em"
-				<h3>
-					Existing Person
-				</h3>
-			</td>
-		</tr> -->
 		<tr id="exist">
 			<td>
 				<h3>
@@ -452,6 +445,7 @@
 				<input type="hidden" name="person_val" id="person_val" />
 				<!-- <br /> -->
 			</td>
+			<td></td>
 		</tr>
 		<tr id="memberName" type="hide">
 			<td>
@@ -476,6 +470,7 @@
 				<span style="color: red">*</span>
 				<span id="mNameTip">Min 3 and max 20.Alphabets,[-.] are allowed</span>
 			</td>
+			<td></td>
 		</tr>
 		<tr id="memberFamilyName" type="hide">
 			<td>
@@ -486,6 +481,7 @@
 				<span style="color: red">*</span>
 				<span id="fNameTip">Min 3 and max 20.Alphabets,[-.] are allowed</span>
 			</td>
+			<td></td>
 		</tr>
 		<tr id="memberBirth" type="hide">
 			<td>
@@ -500,6 +496,7 @@
 					Date shouldn't be in future
 				</span>
 			</td>
+			<td></td>
 		</tr> 
 		<tr id="memberGender" type="hide">
 			<td>
@@ -513,11 +510,14 @@
 				</form:select>
 				<span style="color: red">*</span>
 			</td>
+			<td></td>
 		</tr>
 		<tr>
 			<td style="padding-bottom: 15px" id="loginChoicebox">
 				<input type="checkbox" id="loginChoice" name="loginChoice" /> Add Login Detail
 			</td>
+			<td></td>
+			<td></td>
 		</tr>
 		<tr id="memberUsername" type="hide">
 			<td>
@@ -526,6 +526,7 @@
 			<td>
 				<input type="text" name="userName" id="userName" autocomplete="on" />
 			</td>
+			<td></td>
 		</tr>
 		<tr id="memberPassword" type="hide">
 			<td>
@@ -561,6 +562,7 @@
 					</c:forEach>
 				</select>
 			</td>
+			<td></td>
 		</tr>
 		<tr id="memberIdentifier">
 			<td>
@@ -571,6 +573,7 @@
 				<span style="color: red">*</span>
 				<span style="padding-left: 12px" id="idTip">Min 3 and max 20.All data types and [-_] are allowed</span>
 			</td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>
@@ -585,6 +588,7 @@
 				</select>
 				<span style="color: red">*</span>
 			</td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>
@@ -599,6 +603,7 @@
 				</select>
 				<span style="color: red">*</span>
 			</td>
+			<td></td>
 		</tr>
 		<tr id="memberJoin">
 			<td>
@@ -608,6 +613,7 @@
 				<form:input id="joinDate" path="joinDate" onblur="jQuery('#joinTip').hide();" onfocus="showCalendar(this,60);jQuery('#joinTip').show();join();" />
 				<span id="joinTip">Date shouldn't be in future</span>
 			</td>
+			<td></td>
 		</tr> 
 		<tr id="memberEnd">
 			<td>
@@ -617,6 +623,7 @@
 				<form:input id="leaveDate" path="leaveDate" onfocus="showCalendar(this,60);jQuery('#leaveTip').show();leave();" onblur="jQuery('#leaveTip').hide();" />
 				<span id="leaveTip">Date shouldn't be in future</span>
 			</td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>
@@ -625,6 +632,7 @@
 			<td>
 				<openmrs:fieldGen type="org.openmrs.Location" formFieldName="location" val="${selectedLocation}" />
 			</td>
+			<td></td>
 		</tr>
 		<tr>
 			<td>
@@ -633,6 +641,7 @@
 			<td>
 				<form:checkbox id="isDataProvider" path="isDataProvider" />
 			</td>
+			<td></td>
 		</tr>
 		<tr>
 			<td></td>
@@ -641,12 +650,16 @@
 					Add
 				</button>
 			</td>
+			<td></td>
 		</tr>
-		<tr></tr>
+		<tr><td></td><td></td><td></td></tr>
+		<tr><td></td><td></td><td></td></tr>
 		<tr>
 			<td>
-				<a href="/openmrs/module/teammodule/team.form">Back to Team List</a>
+				<a href="/openmrs/module/teammodule/teamMemberView.form">Back to Team Member List</a>
 			</td>
+			<td></td>
+			<td></td>
 		</tr>
 	</table>
 </form:form>
diff --git a/omod/src/main/webapp/teamMemberView.jsp b/omod/src/main/webapp/teamMemberView.jsp
index 424b3f1..49cfa94 100644
--- a/omod/src/main/webapp/teamMemberView.jsp
+++ b/omod/src/main/webapp/teamMemberView.jsp
@@ -108,7 +108,14 @@
 		        /* Sub Ordinate Teams */
 		        var cell = row.insertCell(-1);
 		    	cell.setAttribute("style", "border: 1px solid");
-		        if(members[i].subTeams === "") { cell.innerHTML = ""; } else { cell.innerHTML = members[i].subTeams + " (" + members[i].subTeamsCount +")"; }
+		        if(members[i].subTeams === null) { cell.innerHTML = ""; } else { 
+		        	var text = "";
+		        	for(var j=0; j<members[i].subTeams.length; j++) {
+		        		//cell.innerHTML = members[i].subTeams[j].teamName;
+		        		text += "<a id='teamMemberTeam' name='teamMemberTeam' title='Vew Team' style='cursor:pointer' onclick='teamMemberTeamDetail(\""+members[i].uuid+"\",\""+members[i].subTeams[j].uuid+"\");'>"+members[i].subTeams[j].teamName+"</a><br>"
+		        	}
+		        	cell.innerHTML = text;
+		        } 
 		        /* History */
 		        var cell = row.insertCell(-1);
 		    	cell.setAttribute("style", "border: 1px solid");
@@ -116,7 +123,7 @@
 		        /* Voided */
 		        var cell = row.insertCell(-1);
 		    	cell.setAttribute("style", "border: 1px solid");
-		        cell.innerHTML = members[i].voided + "<a id='editTeamMemberVoidedLink' name='editTeamMemberVoidedLink' title='Void Team Member' style='cursor:pointer' onclick='editTeamMember(\""+members[i].uuid+"\",\""+"memberVoided"+"\");'><img src='/openmrs/moduleResources/teammodule/img/edit.png' style=' width: 20px; height: 20px; padding-left: 10%; float: right;' ></a>";;
+		        cell.innerHTML = members[i].voided + "<a id='editTeamMemberVoidedLink' name='editTeamMemberVoidedLink' title='Void Team Member' style='cursor:pointer' onclick='editTeamMember(\""+members[i].uuid+"\",\""+"memberVoided"+"\");'><img src='/openmrs/moduleResources/teammodule/img/edit.png' style=' width: 20px; height: 20px; padding-left: 10%; float: right;' ></a>";
 		        /* Patients */
 		        var cell = row.insertCell(-1);
 		    	cell.setAttribute("style", "border: 1px solid");
@@ -138,40 +145,19 @@
 		else if(type==="memberTeamInfo") { $('#editTeamMemberTeamDiv').dialog('close'); } 
 		else if(type==="memberInfo") { $('#editTeamMemberDiv').dialog('close'); } 
 		else if(type==="memberVoided") { $('#editTeamMemberVoidedDiv').dialog('close'); } 
-		else if(type==="memberLocationInfo") { $('#editTeamMemberLocationDiv').dialog('close'); } 
+	}
+	function teamMemberTeamDetail(teamMemberUuid, teamUuid) {
+		$.ajax({
+			url: "/openmrs/ws/rest/v1/team/team/"+teamUuid+"?v=full",
+			success : function(team) { 
+    			document.getElementById("teamMemberTeamDetailDiv").innerHTML = "<table><tr><td>Identifier: </td><td>"+team.teamIdentifier+"</td></tr><tr><td>Name: </td><td>"+team.teamName+"</td></tr><tr><td>Supervisor: </td><td>"+team.supervisor+"</td></tr><tr><td>Voided: </td><td>"+team.voided+"</td></tr><tr><td>Location: </td><td>"+team.location.display+"</td></tr><tr><td>Members: </td><td>"+team.members+"</td></tr></table>";;
+    			//document.getElementById("teamMemberTeamDetailDiv").innerHTML = "<table style='border: black solid 1px;'><tr><td style='border: black solid 1px;'>Identifier: </td><td style='border: black solid 1px;'>"+team.teamIdentifier+"</td></tr><tr><td style='border: black solid 1px;'>Name: </td><td style='border: black solid 1px;'>"+team.teamName+"</td></tr><tr><td style='border: black solid 1px;'>Supervisor: </td><td style='border: black solid 1px;'>"+team.supervisor+"</td></tr><tr><td style='border: black solid 1px;'>Voided: </td><td style='border: black solid 1px;'>"+team.voided+"</td></tr><tr><td style='border: black solid 1px;'>Location: </td><td style='border: black solid 1px;'>"+team.location.display+"</td></tr><tr><td style='border: black solid 1px;'>Members: </td><td style='border: black solid 1px;'>"+team.members+"</td></tr></table>";;
+	    		$("#teamMemberTeamDetailDiv").dialog({ width: "auto", height: "auto", title: "Team Member - Sub Team" , closeText: ""});
+			}, error: function(jqXHR, textStatus, errorThrown) { console.log("ERROR-TEAM-DETAIL"); console.log(jqXHR); }
+		});
 	}
 	function editTeamMemberSuccess(index, type) {
-		if(type==="memberLocationInfo") { 
-			/* var uuid = members[index].uuid;
-			var role = document.getElementById("teamMemberRole"+index).value;
-			var url = "/openmrs/ws/rest/v1/team/teammember/"+uuid+"/role";
-			var data = '{ '; if(role != "") { data += '"role" : "' + role + '"'; } data += ' }';
-			console.log(url);
-			$.ajax({
-				url: url,
-				data : data,
-			 	type: "POST",
-     			contentType: "application/json",
-				success : function(result) { 
-					console.log("SUCCESS-EDIT TEAM MEMBER ROLE");
-					console.log(result); 
-					var teamMember = result.results[0];
-					console.log(teamMember);
-					for (var i = 0; i < members.length; i++) {
-				    	if(members[i].uuid.toString() === teamMember.uuid.toString()) {
-							replace(members, members[i], teamMember);
-							console.log(members);
-							GenerateTable();
-							//$('#example').DataTable({"bFilter": false});
-							document.getElementById("errorHead").innerHTML = ""; 
-							document.getElementById("saveHead").innerHTML = "<p>Team Member Role Updated Successfully</p>"; 
-							$('#editTeamMemberRoleDiv').dialog('close'); 
-						}
-					}
-				}, error: function(jqXHR, textStatus, errorThrown) { console.log("ERROR-EDIT TEAM MEMBER ROLE"); console.log(jqXHR); document.getElementById("saveHead").innerHTML = ""; document.getElementById("errorHead").innerHTML = "<p>Error Occured While Updating Team Member Role</p>"; }
-			}); */
-		} 
-		else if(type==="memberRoleInfo") { 
+		if(type==="memberRoleInfo") { 
 			var uuid = members[index].uuid;
 			var role = document.getElementById("teamMemberRole"+index).value;
 			var url = "/openmrs/ws/rest/v1/team/teammember/"+uuid+"/role";
@@ -326,16 +312,7 @@
 		    			html += "<option value='"+members[i].locations[j].uuid+"'>"+members[i].locations[j].display+"</option>";
 		    		} html += "</select></td></tr><tr><td colspan='2'>REMOVE</td></tr>";
 		    		html += "</form></table>";
-					/* var html = "<table><form><tr><td>Locations: </td><td><select id='teamMemberLocations"+i+"' name='teamMemberLocations"+i+"' multiple onchange='getSelectedLocations(this)'>";
-		    		for (var j = 0; j < allLocationNames.length; j++) {
-		    			if(members[i].locations.includes(allLocationNames[j].toString())) { 
-		    				html += "<option value='"+allLocationIds[j]+"' selected >"+allLocationNames[j]+"</option>"; 
-	    				} 
-		    			else { 
-		    				html += "<option value='"+allLocationIds[j]+"'>"+allLocationNames[j]+"</option>";
-	    				}
-	    	    	} html += "</select></td></tr><tr><td><button type='button' id='teamMemberLocationEditClose' name='teamMemberLocationEditClose' onclick='editTeamMemberClose(\""+i+"\",\""+"memberLocationInfo"+"\");' >Cancel</button></td><td><button type='button' id='teamMemberLocationEditSuccess' name='teamMemberLocationEditSuccess' onclick='editTeamMemberSuccess(\""+i+"\",\""+"memberLocationInfo"+"\");' >Save</button></td></tr></form></table>";
-	    			 */document.getElementById("editTeamMemberLocationDiv").innerHTML = html;
+		    		document.getElementById("editTeamMemberLocationDiv").innerHTML = html;
 		    		$("#editTeamMemberLocationDiv").dialog({ width: "auto", height: "auto", title: "Team Member - Location" , closeText: ""});
 	    		}
 	    		else if(type==="memberRoleInfo") {
@@ -465,5 +442,6 @@
 <div id="editTeamMemberTeamDiv"></div>
 <div id="editTeamMemberVoidedDiv"></div>
 <div id="editTeamMemberLocationDiv"></div>
+<div id="teamMemberTeamDetailDiv"></div>
 
 <%@ include file="/WEB-INF/template/footer.jsp"%>
diff --git a/omod/src/main/webapp/teamRole.jsp b/omod/src/main/webapp/teamRole.jsp
index 9b04cbc..39d34f6 100644
--- a/omod/src/main/webapp/teamRole.jsp
+++ b/omod/src/main/webapp/teamRole.jsp
@@ -25,104 +25,107 @@
 	border-collapse: collapse;
 }
 </style>
-<script type="text/javascript">
-	$(document).ready(function() {
-		$('#historyDialog').hide();
-		$('#memberDialog').hide();
-		var tbody,table,teamDataVar;
-		table = document.getElementById("general");
-		tbody= document.createElement("TBODY");
-			var  data = $.get("/openmrs/ws/rest/v1/team/teamrole?v=full", function(teamRoleData) {
-			teamRoles = teamRoleData.results;
-			GenerateTable(tbody);
-			table.appendChild(tbody);
-			$('#general').DataTable({
-				"language" : {
-					"search" : "_INPUT_",
-					"searchPlaceholder" : "Search..."
-				},
-				"paging" : true,
-				"lengthChange" : false,
-				"searching" : true,
-				"ordering" : true,
-				"info" : false,
-				"autoWidth" : true,
-				"sDom" : 'lfrtip',
+	<script type="text/javascript">
+		$(document).ready(function() {
+			$('#historyDialog').hide();
+			$('#memberDialog').hide();
+			var tbody,table,teamDataVar;
+			table = document.getElementById("general");
+			tbody= document.createElement("TBODY");
+				var  data = $.get("/openmrs/ws/rest/v1/team/teamrole?v=full", function(teamRoleData) {
+				teamRoles = teamRoleData.results;
+				GenerateTable(tbody);
+				table.appendChild(tbody);
+				$('#general').DataTable({
+					"language" : {
+						"search" : "_INPUT_",
+						"searchPlaceholder" : "Search..."
+					},
+					"paging" : true,
+					"lengthChange" : false,
+					"searching" : true,
+					"ordering" : true,
+					"info" : false,
+					"autoWidth" : true,
+					"sDom" : 'lfrtip',
+				});
 			});
 		});
-	});
-
-	function GenerateTable(tbody) {
-			for(var i=0;i<teamRoles.length;i++)
-			{
-			row = tbody.insertRow(-1);
+	
+		function GenerateTable(tbody) {
+				console.log(teamRoles);
+				for(var i=0;i<teamRoles.length;i++)
+				{
+				row = tbody.insertRow(-1);
 				/* Edit */
-			var cell = row.insertCell(-1);
-			cell.innerHTML = "Edit";
-			/* Name */
-			var cell = row.insertCell(-1);
-			cell.innerHTML = teamRoles[i].name;
-			/* Role */
-			var cell = row.insertCell(-1);
-			cell.innerHTML = teamRoles.length;
-			
-			var cell = row.insertCell(-1);
-			cell.innerHTML = teamRoles[i].ReportToName;	
-			/* Team */
-			var cell = row.insertCell(-1);
-			cell.innerHTML = teamRoles[i].ownsTeam;
-			
-			/* Report To */
-			var cell = row.insertCell(-1);
-			if(teamRoles[i].ReportByName != null)
-			for(var i=0;i<teamRoles[i].ReportByName.length;i++)
-				cell.innerHTML = teamRoles[i].ReportByName[i][1];
-			else
-			cell.innerHTML = "-";
-			
-			var cell = row.insertCell(-1);
-			cell.innerHTML = '<a onClick="teamsHierarchyHistory(\''+ teamRoles[i].uuid + '\')">History</a>';
-			
+				var cell = row.insertCell(-1);
+		        cell.innerHTML = "Edit<a id='editTeamRoleLink' name='editTeamRoleLink' title='Edit Team Role' style='cursor:pointer' href='/openmrs/module/teammodule/editRole.form?roleId="+teamRoles[i].uuid+"'><img src='/openmrs/moduleResources/teammodule/img/edit.png' style=' width: 20px; height: 20px; padding-left: 10%; float: right;' ></a>";
+				/* Name */
+				var cell = row.insertCell(-1);
+				cell.innerHTML = teamRoles[i].name;
+				/* Role */
+				var cell = row.insertCell(-1);
+				cell.innerHTML = teamRoles.length;
+				
+				var cell = row.insertCell(-1);
+				cell.innerHTML = teamRoles[i].reportToName;	
+				/* Team */
+				var cell = row.insertCell(-1);
+				cell.innerHTML = teamRoles[i].ownsTeam;
+				
+				/* Report To */
+				var cell = row.insertCell(-1);
+				if(teamRoles[i].reportByName != null) {
+					for(var j=0;j<teamRoles[i].reportByName.length;j++) {
+						cell.innerHTML = teamRoles[i].reportByName[j][1];
+					}
+				}
+				else {
+					cell.innerHTML = "-";
+				}
+				var cell = row.insertCell(-1);
+				cell.innerHTML = '<a onClick="teamsHierarchyHistory(\''+ teamRoles[i].uuid + '\')">History</a>';
+				
 			}
-		
-	}
-
-	function teamsHierarchyHistory(teamId) {
-		$.get("/openmrs/ws/rest/v1/team/teamhierarchylog?teamRole=" + teamId,
-						function(data) {
-							var myTable = document.getElementById("history");
-							var rowCount = myTable.rows.length;
-
-							for (i = 0; i < rowCount; i++) {
-								$("#historyRow").remove();
-							}
-							for (i = 0; i < data.length; i++) {
-								$("#history")
-										.append(
-												"<tr id=\"historyRow\">"
-														+ "<td style=\"text-align: left;\" valign=\"top\">"
-														+ data.results[i].teamRole.name
-														+ "</td>"
-														+ "<td style=\"text-align: left;\" valign=\"top\">"
-														+ data[i].action
-														+ "</td>"
-														+ "<td style=\"text-align: left;\" valign=\"top\">"
-														+ data[i].dataNew
-														+ "</td>"
-														+ "<td style=\"text-align: left;\" valign=\"top\">"
-														+ data[i].log
-														+ "</td>" + "</tr>");
-							}
-						});
-		$("#historyDialog").dialog({
-			width : "auto",
-			height : "auto",
-			title : "History",
-			closeText : ""
-		});
-	}
+			
+		}
 	
-</script>
+		function teamsHierarchyHistory(teamId) {
+			$.get("/openmrs/ws/rest/v1/team/teamrolelog?teamRole=" + teamId,
+							function(data) {
+								var myTable = document.getElementById("history");
+								var rowCount = myTable.rows.length;
+	
+								for (i = 0; i < rowCount; i++) {
+									$("#historyRow").remove();
+								}
+								for (i = 0; i < data.length; i++) {
+									$("#history")
+											.append(
+													"<tr id=\"historyRow\">"
+															+ "<td style=\"text-align: left;\" valign=\"top\">"
+															+ data.results[i].teamRole.name
+															+ "</td>"
+															+ "<td style=\"text-align: left;\" valign=\"top\">"
+															+ data[i].action
+															+ "</td>"
+															+ "<td style=\"text-align: left;\" valign=\"top\">"
+															+ data[i].dataNew
+															+ "</td>"
+															+ "<td style=\"text-align: left;\" valign=\"top\">"
+															+ data[i].log
+															+ "</td>" + "</tr>");
+								}
+							});
+			$("#historyDialog").dialog({
+				width : "auto",
+				height : "auto",
+				title : "History",
+				closeText : ""
+			});
+		}
+		
+	</script>
 </head>
 
 <div id="historyDialog">
@@ -148,7 +151,7 @@
 		</tr>
 	</table>
 </div>
-<h1>Teams Hierarchy</h1>
+<h1>Teams Role</h1>
 
 <table class="extra">
 	<tr>
diff --git a/pom.xml b/pom.xml
index 9cb0312..0d0e6d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>org.openmrs.module</groupId>
 	<artifactId>teammodule</artifactId>
-	<version>2.0.0</version>
+	<version>2.0.0A</version>
 	<packaging>pom</packaging>
 	<name>Team Management Module</name>
 	<description>A module that manages the teams.</description>