redo add template and add new pillbox for tags too