Adjusted markup for role & user details to better match standard