Further UI issues fixed with the new Trash function