Merge pull request #31 from sarahgosago/v1.0.0/1992

Display of Tags and Tag count
fix tag css
Merge pull request #32 from sarahgosago/v1.0.0/1950

fix tag css
fix merge conflict