[IMP] Improve view