fixed a bunch of missing tags, using new buttons