LPS-41528 Separate out name and address to their own JSP. No logic change