Added system name to valueset, updated mockup to show timing