Re-work user types and content types display to make it more user-friendly