Refactor: taggit UI and code