Index: lams_central/src/java/org/lamsfoundation/lams/web/PortraitController.java
===================================================================
diff -u -r52f09d3d3dd6998ff9cb9e7377c7501341ad7a23 -r72423762cd6df6a5f3887e5eace884eb7d4ca577
--- lams_central/src/java/org/lamsfoundation/lams/web/PortraitController.java	(.../PortraitController.java)	(revision 52f09d3d3dd6998ff9cb9e7377c7501341ad7a23)
+++ lams_central/src/java/org/lamsfoundation/lams/web/PortraitController.java	(.../PortraitController.java)	(revision 72423762cd6df6a5f3887e5eace884eb7d4ca577)
@@ -52,6 +52,6 @@
 	log.debug("using portraitUuid=" + portraitUuid);
 	// if no portrait has been uploaded, set the uuid to 0
 	portraitForm.setPortraitUuid(portraitUuid == null ? 0 : portraitUuid);
-	return "portrait";
+	return "profile/portrait";
     }
 }
Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileController.java
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r72423762cd6df6a5f3887e5eace884eb7d4ca577
--- lams_central/src/java/org/lamsfoundation/lams/web/ProfileController.java	(.../ProfileController.java)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileController.java	(.../ProfileController.java)	(revision 72423762cd6df6a5f3887e5eace884eb7d4ca577)
@@ -111,7 +111,7 @@
 	request.setAttribute("email", (email != null ? email : ""));
 	request.setAttribute("portraitUuid", requestor.getPortraitUuid());
 
-	return "profile";
+	return "profile/profile";
     }
 
     @RequestMapping("/lessons")
@@ -189,7 +189,7 @@
 
 	request.setAttribute("beans", beans);
 
-	return "lessons";
+	return "profile/lessons";
     }
 
     private IndexOrgBean getOrgBean(String name, List<IndexOrgBean> list) {
@@ -207,7 +207,7 @@
 	List<PolicyDTO> policyDtos = policyService.getPolicyDtosByUser(userId);
 	request.setAttribute("policyDtos", policyDtos);
 
-	return "profilePolicyConsents";
+	return "profile/profilePolicyConsents";
     }
 
     @RequestMapping("/displayPolicyDetails")
@@ -216,7 +216,7 @@
 	Policy policy = policyService.getPolicyByUid(policyUid);
 	request.setAttribute("policy", policy);
 
-	return "policyDetails";
+	return "profile/policyDetails";
     }
 
     @RequestMapping("/edit")
@@ -285,7 +285,7 @@
 	}
 	request.setAttribute("timezoneDtos", timezoneDtos);
 
-	return "editprofile";
+	return "profile/editprofile";
     }
 
 }