Adding disk label and disk image to show page.  Reworking display to better match with mockup. fixes #4036