[IMP] Improve views