Have disks work in advance layout
Merge pull request #371 from nlake44/advance-layout-disk

Have disks work in advance layout