[IMP] improved view, added icons