Add IDs, adjust text