[IMP] Improve the views