scrollbar for long pages, initial version of DPUInstance detail dialog
import fix
conflict resolution