Add delete button, add tags, some bugfixs