Updated Disk to be variations depending on how many disk in computer.
Moved Info-Primary to simply "System"