Almost everything works

Just need to add filtering to buttons / button lists and take out
Identifiers from inserted tags