Refactor: taggit UI and code
merge commit from local