Added item edit and more