Added delete buttons to grid
Merge branch 'master' into vendor_ui
Item view is a list instead of view
Merge branch 'master' into vendor_ui