Latest fixes from staging

includes admin notes, changes to how deletes are handled, badge claim fixes, and some UI improvements.