More UI fixes, introduce WorkspaceDependencyManager