Adding and editing of tags finished

Closes #21, closes #22