[IMP] Improve graph views