Added ability to archive & delete