Clean up layout a bit
WIP 3D and DICOM geometry support