added trashcan, other front end clean up