This also clears up allowed values for the disk input and normalizes the messaging between edit and create screens.